diff options
author | kib <kib@FreeBSD.org> | 2009-08-29 21:53:08 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2009-08-29 21:53:08 +0000 |
commit | d105721a2238d8018e13ee3e8aa7face7a10a2e5 (patch) | |
tree | ac1b3c153ca3423ba66347e6a8bb50406e26038c /sys/kern/kern_fork.c | |
parent | 7e88789784ae0e3126509bacd97d46cc20dbf6f8 (diff) | |
download | FreeBSD-src-d105721a2238d8018e13ee3e8aa7face7a10a2e5.zip FreeBSD-src-d105721a2238d8018e13ee3e8aa7face7a10a2e5.tar.gz |
Reverse r196640 and r196644 for now.
Diffstat (limited to 'sys/kern/kern_fork.c')
-rw-r--r-- | sys/kern/kern_fork.c | 25 |
1 files changed, 10 insertions, 15 deletions
diff --git a/sys/kern/kern_fork.c b/sys/kern/kern_fork.c index 03d8cbc..4e2eaa9 100644 --- a/sys/kern/kern_fork.c +++ b/sys/kern/kern_fork.c @@ -39,7 +39,6 @@ __FBSDID("$FreeBSD$"); #include "opt_kdtrace.h" #include "opt_ktrace.h" -#include "opt_kstack_pages.h" #include <sys/param.h> #include <sys/systm.h> @@ -277,29 +276,25 @@ norfproc_fail: mem_charged = 0; vm2 = NULL; - if (pages == 0) - pages = KSTACK_PAGES; /* Allocate new proc. */ newproc = uma_zalloc(proc_zone, M_WAITOK); - td2 = FIRST_THREAD_IN_PROC(newproc); - if (td2 == NULL) { - td2 = thread_alloc(pages); + if (TAILQ_EMPTY(&newproc->p_threads)) { + td2 = thread_alloc(); if (td2 == NULL) { error = ENOMEM; goto fail1; } proc_linkup(newproc, td2); - } else { - if (td2->td_kstack == 0 || td2->td_kstack_pages != pages) { - if (td2->td_kstack != 0) - vm_thread_dispose(td2); - if (!thread_alloc_stack(td2, pages)) { - error = ENOMEM; - goto fail1; - } + } else + td2 = FIRST_THREAD_IN_PROC(newproc); + + /* Allocate and switch to an alternate kstack if specified. */ + if (pages != 0) { + if (!vm_thread_new_altkstack(td2, pages)) { + error = ENOMEM; + goto fail1; } } - if ((flags & RFMEM) == 0) { vm2 = vmspace_fork(p1->p_vmspace, &mem_charged); if (vm2 == NULL) { |