diff options
| author | Renato Botelho <renato@netgate.com> | 2016-02-17 11:17:17 -0200 |
|---|---|---|
| committer | Renato Botelho <renato@netgate.com> | 2016-02-17 11:17:17 -0200 |
| commit | eea87801dfdf1b51cc56159a1b1eb69109b7c9e7 (patch) | |
| tree | 1792ac0d334dd3ef5cf5459a0a61a5c0c86dccc0 /sys/kern | |
| parent | 3882f7f0612f5660c6287cfa1ba025f2843a1957 (diff) | |
| parent | 4aef3019513be35be30d1ea8ff5b072a743f99df (diff) | |
| download | FreeBSD-src-eea87801dfdf1b51cc56159a1b1eb69109b7c9e7.zip FreeBSD-src-eea87801dfdf1b51cc56159a1b1eb69109b7c9e7.tar.gz | |
Merge remote-tracking branch 'origin/stable/10' into devel
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/init_main.c | 2 | ||||
| -rw-r--r-- | sys/kern/kern_fork.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 201680a..ae6bd3a 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -479,7 +479,7 @@ proc0_init(void *dummy __unused) session0.s_leader = p; p->p_sysent = &null_sysvec; - p->p_flag = P_SYSTEM | P_INMEM; + p->p_flag = P_SYSTEM | P_INMEM | P_KTHREAD; p->p_flag2 = 0; p->p_state = PRS_NORMAL; knlist_init_mtx(&p->p_klist, &p->p_mtx); diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 6ca41d4..f24ba20 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -1033,7 +1033,7 @@ fork_exit(void (*callout)(void *, struct trapframe *), void *arg, if (p->p_flag & P_KTHREAD) { 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); |
