diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-11 17:34:05 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-11 17:34:05 +0300 |
| commit | d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a (patch) | |
| tree | 250be7a5a29069f7d1f4524fa45ab0e988833025 /kernel/fork.c | |
| parent | 490dea45d00f01847ebebd007685d564aaf2cd98 (diff) | |
| parent | c59765042f53a79a7a65585042ff463b69cb248c (diff) | |
| download | linux-d19b85db9d5c44a4c21dcb10d6fbadaa4425ab2a.tar.xz | |
Merge commit 'v2.6.29-rc1' into timers/urgent
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 7087d8c0e5e2..e995899ea83f 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1125,12 +1125,12 @@ static struct task_struct *copy_process(unsigned long clone_flags, if (pid != &init_struct_pid) { retval = -ENOMEM; - pid = alloc_pid(task_active_pid_ns(p)); + pid = alloc_pid(p->nsproxy->pid_ns); if (!pid) goto bad_fork_cleanup_io; if (clone_flags & CLONE_NEWPID) { - retval = pid_ns_prepare_proc(task_active_pid_ns(p)); + retval = pid_ns_prepare_proc(p->nsproxy->pid_ns); if (retval < 0) goto bad_fork_free_pid; } @@ -1480,12 +1480,10 @@ void __init proc_caches_init(void) fs_cachep = kmem_cache_create("fs_cache", sizeof(struct fs_struct), 0, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); - vm_area_cachep = kmem_cache_create("vm_area_struct", - sizeof(struct vm_area_struct), 0, - SLAB_PANIC, NULL); mm_cachep = kmem_cache_create("mm_struct", sizeof(struct mm_struct), ARCH_MIN_MMSTRUCT_ALIGN, SLAB_HWCACHE_ALIGN|SLAB_PANIC, NULL); + mmap_init(); } /* |