diff options
| author |   tedu <tedu@openbsd.org> | 2010-06-29 19:09:11 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2010-06-29 19:09:11 +0000 |
| commit | d7939e928d5030688d500e327511dd1f6220f9c8 (patch) | |
| tree | c65a3cbe310c88c4e061cd904c7bf6394b2d2407 | |
| parent | Add code to make ahci(4) suspend/resume properly. Probably not perfect yet, (diff) | |
| download | wireguard-openbsd-d7939e928d5030688d500e327511dd1f6220f9c8.tar.xz wireguard-openbsd-d7939e928d5030688d500e327511dd1f6220f9c8.zip | |
remove the compat43 ifdef around some code. in effect, it's always been
in compat mode and there's no harm continuing that way.
ok dlg deraadt guenther miod thib
| -rw-r--r-- | sys/kern/kern_prot.c | 16 | ||||
| -rw-r--r-- | sys/kern/tty_conf.c | 7 |
2 files changed, 5 insertions, 18 deletions
diff --git a/sys/kern/kern_prot.c b/sys/kern/kern_prot.c index d15cf2d0447..e27f6a1eb03 100644 --- a/sys/kern/kern_prot.c +++ b/sys/kern/kern_prot.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_prot.c,v 1.43 2010/06/29 00:28:14 tedu Exp $ */ +/* $OpenBSD: kern_prot.c,v 1.44 2010/06/29 19:09:11 tedu Exp $ */ /* $NetBSD: kern_prot.c,v 1.33 1996/02/09 18:59:42 christos Exp $ */ /* @@ -59,11 +59,8 @@ int sys_getpid(struct proc *p, void *v, register_t *retval) { - *retval = p->p_p->ps_mainproc->p_pid; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_IBCS2) || \ - defined(COMPAT_FREEBSD) || defined(COMPAT_BSDOS) + retval[0] = p->p_p->ps_mainproc->p_pid; retval[1] = p->p_p->ps_mainproc->p_pptr->p_pid; -#endif return (0); } @@ -145,11 +142,8 @@ int sys_getuid(struct proc *p, void *v, register_t *retval) { - *retval = p->p_cred->p_ruid; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_IBCS2) || \ - defined(COMPAT_FREEBSD) || defined(COMPAT_BSDOS) + retval[0] = p->p_cred->p_ruid; retval[1] = p->p_ucred->cr_uid; -#endif return (0); } @@ -178,10 +172,8 @@ int sys_getgid(struct proc *p, void *v, register_t *retval) { - *retval = p->p_cred->p_rgid; -#if defined(COMPAT_43) || defined(COMPAT_SUNOS) || defined(COMPAT_FREEBSD) || defined(COMPAT_BSDOS) + retval[0] = p->p_cred->p_rgid; retval[1] = p->p_ucred->cr_gid; -#endif return (0); } diff --git a/sys/kern/tty_conf.c b/sys/kern/tty_conf.c index 10140fa4aaa..2b88bb4521c 100644 --- a/sys/kern/tty_conf.c +++ b/sys/kern/tty_conf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: tty_conf.c,v 1.15 2010/04/12 12:57:52 tedu Exp $ */ +/* $OpenBSD: tty_conf.c,v 1.16 2010/06/29 19:09:12 tedu Exp $ */ /* $NetBSD: tty_conf.c,v 1.18 1996/05/19 17:17:55 jonathan Exp $ */ /*- @@ -103,13 +103,8 @@ struct linesw linesw[] = { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl, ttyerrinput, ttyerrstart, nullmodem }, /* 1- defunct */ -#if defined(COMPAT_43) || defined(COMPAT_FREEBSD) || defined(COMPAT_BSDOS) { ttyopen, ttylclose, ttread, ttwrite, nullioctl, ttyinput, ttstart, ttymodem }, /* 2- old NTTYDISC */ -#else - { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl, - ttyerrinput, ttyerrstart, nullmodem }, /* 2- defunct */ -#endif /* 3- TABLDISC (defunct) */ { ttynodisc, ttyerrclose, ttyerrio, ttyerrio, nullioctl, |