diff options
-rw-r--r-- | sys/kern/kern_fork.c | 27 | ||||
-rw-r--r-- | sys/kern/syscalls.master | 4 | ||||
-rw-r--r-- | sys/sys/unistd.h | 9 |
3 files changed, 4 insertions, 36 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 4f3e7fbacf6..b3e658c3692 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_fork.c,v 1.143 2012/11/19 09:26:08 guenther Exp $ */ +/* $OpenBSD: kern_fork.c,v 1.144 2013/03/02 07:05:17 guenther Exp $ */ /* $NetBSD: kern_fork.c,v 1.29 1996/02/09 18:59:34 christos Exp $ */ /* @@ -141,31 +141,6 @@ sys___tfork(struct proc *p, void *v, register_t *retval) tfork_child_return, param.tf_tcb, retval, NULL)); } -#ifdef COMPAT_O51 -int -compat_o51_sys___tfork(struct proc *p, void *v, register_t *retval) -{ - struct compat_o51_sys___tfork_args /* { - syscallarg(struct __tfork51) *param; - } */ *uap = v; - struct __tfork51 param; - int flags; - int error; - - if ((error = copyin(SCARG(uap, param), ¶m, sizeof(param)))) - return (error); - - if (param.tf_flags != 0) - return (EINVAL); - - flags = FORK_TFORK | FORK_THREAD | FORK_SIGHAND | FORK_SHAREVM - | FORK_NOZOMBIE | FORK_SHAREFILES; - - return (fork1(p, 0, flags, NULL, param.tf_tid, tfork_child_return, - param.tf_tcb, retval, NULL)); -} -#endif - void tfork_child_return(void *arg) { diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index c7badf48246..90e0271a650 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,4 @@ -; $OpenBSD: syscalls.master,v 1.126 2012/09/10 02:22:17 deraadt Exp $ +; $OpenBSD: syscalls.master,v 1.127 2013/03/02 07:05:18 guenther Exp $ ; $NetBSD: syscalls.master,v 1.32 1996/04/23 10:24:21 mycroft Exp $ ; @(#)syscalls.master 8.2 (Berkeley) 1/13/94 @@ -564,6 +564,6 @@ const struct timespec *times, int flag); } 327 STD { int sys_futimens(int fd, \ const struct timespec *times); } -328 COMPAT_O51 { int sys___tfork(struct __tfork51 *param); } +328 OBSOL otfork51 329 STD NOLOCK { void sys___set_tcb(void *tcb); } 330 STD NOLOCK { void *sys___get_tcb(void); } diff --git a/sys/sys/unistd.h b/sys/sys/unistd.h index a7bdfaec207..94db8ac5021 100644 --- a/sys/sys/unistd.h +++ b/sys/sys/unistd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: unistd.h,v 1.24 2012/06/21 00:56:59 guenther Exp $ */ +/* $OpenBSD: unistd.h,v 1.25 2013/03/02 07:05:18 guenther Exp $ */ /* $NetBSD: unistd.h,v 1.10 1994/06/29 06:46:06 cgd Exp $ */ /* @@ -65,13 +65,6 @@ struct __tfork { pid_t *tf_tid; void *tf_stack; }; - -/* COMPAT_O51 */ -struct __tfork51 { - void *tf_tcb; - pid_t *tf_tid; - int tf_flags; -}; #endif /* the pathconf(2) variable values are part of the ABI */ |