summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordchagin <dchagin@FreeBSD.org>2016-01-09 14:36:44 +0000
committerdchagin <dchagin@FreeBSD.org>2016-01-09 14:36:44 +0000
commitb18ea4d2a0bcd9dbc2f21c20535204945cedf82d (patch)
tree98fa8640a63947fa2fcf8fa5a612218e56aeaa30
parent994d3d588922f9f69ec5ae11759551398228bf1a (diff)
downloadFreeBSD-src-b18ea4d2a0bcd9dbc2f21c20535204945cedf82d.zip
FreeBSD-src-b18ea4d2a0bcd9dbc2f21c20535204945cedf82d.tar.gz
MFC r283372:
In preparation for switching linuxulator to the use the native 1:1 threads split sys_thr_exit() up into sys_thr_exit() and kern_thr_exit(). Move Where the second will be used in linux_exit() system call later.
-rw-r--r--sys/kern/kern_thr.c14
-rw-r--r--sys/sys/syscallsubr.h1
2 files changed, 11 insertions, 4 deletions
diff --git a/sys/kern/kern_thr.c b/sys/kern/kern_thr.c
index 058dc19..e2cb5dd 100644
--- a/sys/kern/kern_thr.c
+++ b/sys/kern/kern_thr.c
@@ -305,9 +305,6 @@ int
sys_thr_exit(struct thread *td, struct thr_exit_args *uap)
/* long *state */
{
- struct proc *p;
-
- p = td->td_proc;
/* Signal userland that it can free the stack. */
if ((void *)uap->state != NULL) {
@@ -315,8 +312,17 @@ sys_thr_exit(struct thread *td, struct thr_exit_args *uap)
kern_umtx_wake(td, uap->state, INT_MAX, 0);
}
- rw_wlock(&tidhash_lock);
+ return (kern_thr_exit(td));
+}
+
+int
+kern_thr_exit(struct thread *td)
+{
+ struct proc *p;
+ p = td->td_proc;
+
+ rw_wlock(&tidhash_lock);
PROC_LOCK(p);
if (p->p_numthreads != 1) {
diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h
index 397a21a..665752a 100644
--- a/sys/sys/syscallsubr.h
+++ b/sys/sys/syscallsubr.h
@@ -246,6 +246,7 @@ int kern_ktimer_settime(struct thread *td, int timer_id, int flags,
int kern_ktimer_gettime(struct thread *td, int timer_id,
struct itimerspec *val);
int kern_ktimer_getoverrun(struct thread *td, int timer_id);
+int kern_thr_exit(struct thread *td);
int kern_thr_new(struct thread *td, struct thr_param *param);
int kern_thr_suspend(struct thread *td, struct timespec *tsp);
int kern_truncate(struct thread *td, char *path, enum uio_seg pathseg,
OpenPOWER on IntegriCloud