diff options
Diffstat (limited to 'sys/kern/kern_exit.c')
| -rw-r--r-- | sys/kern/kern_exit.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 19e4d30d70f..7cd416720b4 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.92 2010/05/26 15:16:57 oga Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.93 2010/06/29 00:28:14 tedu Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -90,7 +90,6 @@ sys_exit(struct proc *p, void *v, register_t *retval) return (0); } -#ifdef RTHREADS int sys_threxit(struct proc *p, void *v, register_t *retval) { @@ -98,6 +97,9 @@ sys_threxit(struct proc *p, void *v, register_t *retval) syscallarg(pid_t *) notdead; } */ *uap = v; + if (!rthreads_enabled) + return (EINVAL); + if (SCARG(uap, notdead) != NULL) { pid_t zero = 0; if (copyout(&zero, SCARG(uap, notdead), sizeof(zero))) { @@ -108,7 +110,6 @@ sys_threxit(struct proc *p, void *v, register_t *retval) return (0); } -#endif /* * Exit: deallocate address space and other resources, change proc state @@ -126,7 +127,6 @@ exit1(struct proc *p, int rv, int flags) /* unlink ourselves from the active threads */ TAILQ_REMOVE(&p->p_p->ps_threads, p, p_thr_link); -#ifdef RTHREADS if (TAILQ_EMPTY(&p->p_p->ps_threads)) wakeup(&p->p_p->ps_threads); /* @@ -159,7 +159,6 @@ exit1(struct proc *p, int rv, int flags) while (!TAILQ_EMPTY(&p->p_p->ps_threads)) tsleep(&p->p_p->ps_threads, PUSER, "thrdeath", 0); } -#endif if (p->p_flag & P_PROFIL) stopprofclock(p); |