diff options
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index e341615f2..9f3d9f507 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -19,8 +19,8 @@ #include <linux/vmalloc.h> #include <asm/pgtable.h> -#include <asm/mmu_context.h> #include <asm/uaccess.h> +#include <asm/mmu_context.h> /* The idle threads do not count.. */ int nr_threads=0; @@ -157,7 +157,7 @@ int alloc_uid(struct task_struct *p) return 0; } -void __init fork_init(unsigned long memsize) +void __init fork_init(unsigned long mempages) { int i; @@ -175,7 +175,7 @@ void __init fork_init(unsigned long memsize) * value: the thread structures can take up at most half * of memory. */ - max_threads = memsize / THREAD_SIZE / 2; + max_threads = mempages / (THREAD_SIZE/PAGE_SIZE) / 2; init_task.rlim[RLIMIT_NPROC].rlim_cur = max_threads/2; init_task.rlim[RLIMIT_NPROC].rlim_max = max_threads/2; @@ -693,6 +693,11 @@ int do_fork(unsigned long clone_flags, unsigned long usp, struct pt_regs *regs) if (retval) goto bad_fork_cleanup_sighand; p->semundo = NULL; + + /* Our parent execution domain becomes current domain + These must match for thread signalling to apply */ + + p->parent_exec_id = p->self_exec_id; /* ok, now we should be set up.. */ p->swappable = 1; |