diff options
| author | 2011-07-08 05:01:27 +0000 | |
|---|---|---|
| committer | 2011-07-08 05:01:27 +0000 | |
| commit | 90b09c089284a45085054451a982b60852153558 (patch) | |
| tree | 935c87db9d302745a88a640d05b7d547a959f19b /sys/compat/linux/linux_misc.c | |
| parent | fix boot output and make sure spamlogd is only started when needed (diff) | |
| download | wireguard-openbsd-90b09c089284a45085054451a982b60852153558.tar.xz wireguard-openbsd-90b09c089284a45085054451a982b60852153558.zip | |
Remove the sys_opipe() kernel entry point. sys_pipe() is the future.
While here, switch compat_linux to just use sys_pipe() rather than
incorrectly wrapping sys_opipe().
ok tedu@, miod@
Diffstat (limited to 'sys/compat/linux/linux_misc.c')
| -rw-r--r-- | sys/compat/linux/linux_misc.c | 48 |
1 files changed, 1 insertions, 47 deletions
diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 4733511b35c..ec237c17bed 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: linux_misc.c,v 1.69 2011/07/07 01:19:39 tedu Exp $ */ +/* $OpenBSD: linux_misc.c,v 1.70 2011/07/08 05:01:27 matthew Exp $ */ /* $NetBSD: linux_misc.c,v 1.27 1996/05/20 01:59:21 fvdl Exp $ */ /*- @@ -765,52 +765,6 @@ linux_sys_times(p, v, retval) } /* - * OpenBSD passes fd[0] in retval[0], and fd[1] in retval[1]. - * Linux directly passes the pointer. - */ -int -linux_sys_pipe(p, v, retval) - struct proc *p; - void *v; - register_t *retval; -{ - struct linux_sys_pipe_args /* { - syscallarg(int *) pfds; - } */ *uap = v; - int error; - int pfds[2]; -#ifdef __i386__ - int reg_edx = retval[1]; -#endif /* __i386__ */ - - if ((error = sys_opipe(p, 0, retval))) { -#ifdef __i386__ - retval[1] = reg_edx; -#endif /* __i386__ */ - return error; - } - - /* Assumes register_t is an int */ - - pfds[0] = retval[0]; - pfds[1] = retval[1]; - if ((error = copyout(pfds, SCARG(uap, pfds), 2 * sizeof (int)))) { -#ifdef __i386__ - retval[1] = reg_edx; -#endif /* __i386__ */ - fdrelease(p, retval[0]); - fdrelease(p, retval[1]); - return error; - } - - retval[0] = 0; -#ifdef __i386__ - retval[1] = reg_edx; -#endif /* __i386__ */ - return 0; -} - -/* * Alarm. This is a libc call which uses setitimer(2) in OpenBSD. * Fiddle with the timers to make it work. */ |
