diff options
author | Paul Jackson <pj@sgi.com> | 2006-01-08 10:02:01 +0100 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-09 05:13:44 +0100 |
commit | c417f0242ebe578924a30d4e53d35b5059fed4e7 (patch) | |
tree | 3058c7c79aedb11e7013f5faca34eb07e9a761bd /init/main.c | |
parent | [PATCH] cpuset: migrate all tasks in cpuset at once (diff) | |
download | linux-c417f0242ebe578924a30d4e53d35b5059fed4e7.tar.xz linux-c417f0242ebe578924a30d4e53d35b5059fed4e7.zip |
[PATCH] cpuset: remove test for null cpuset from alloc code path
Remove a couple of more lines of code from the cpuset hooks in the page
allocation code path.
There was a check for a NULL cpuset pointer in the routine
cpuset_update_task_memory_state() that was only needed during system boot,
after the memory subsystem was initialized, before the cpuset subsystem was
initialized, to catch a NULL task->cpuset pointer.
Add a cpuset_init_early() routine, just before the mem_init() call in
init/main.c, that sets up just enough of the init tasks cpuset structure to
render cpuset_update_task_memory_state() calls harmless.
Signed-off-by: Paul Jackson <pj@sgi.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'init/main.c')
-rw-r--r-- | init/main.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/init/main.c b/init/main.c index 2ed3638deec7..afe5eb84ad52 100644 --- a/init/main.c +++ b/init/main.c @@ -512,6 +512,7 @@ asmlinkage void __init start_kernel(void) } #endif vfs_caches_init_early(); + cpuset_init_early(); mem_init(); kmem_cache_init(); setup_per_cpu_pageset(); |