summaryrefslogtreecommitdiffstats
path: root/sys/kern/kern_fork.c
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2016-02-11 20:07:09 +0000
committerdim <dim@FreeBSD.org>2016-02-11 20:07:09 +0000
commitafa214d26dae14a294ff215b5a55e9acaf67d18f (patch)
treed5418788f5368ac552e6ffa543d661830d835dbb /sys/kern/kern_fork.c
parent86bef0867f0389dc03d4cd4913f5dee79377226f (diff)
parent5183fdd185bc8709354de8b0b88b8925644c2a4b (diff)
downloadFreeBSD-src-afa214d26dae14a294ff215b5a55e9acaf67d18f.zip
FreeBSD-src-afa214d26dae14a294ff215b5a55e9acaf67d18f.tar.gz
Merge ^/head r295351 through r295543.
Diffstat (limited to 'sys/kern/kern_fork.c')
-rw-r--r--sys/kern/kern_fork.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c
index 9abe08c..94e139e 100644
--- a/sys/kern/kern_fork.c
+++ b/sys/kern/kern_fork.c
@@ -1037,10 +1037,10 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg,
* Check if a kernel thread misbehaved and returned from its main
* function.
*/
- if (p->p_flag & P_KTHREAD) {
+ if (p->p_flag & P_KPROC) {
printf("Kernel thread \"%s\" (pid %d) exited prematurely.\n",
td->td_name, p->p_pid);
- kproc_exit(0);
+ kthread_exit();
}
mtx_assert(&Giant, MA_NOTOWNED);
OpenPOWER on IntegriCloud