From: Lee Schermerhorn The N_*_MEMORY and N_CPU node state masks are not being initialized for !NUMA because node_set_state() becomes a no-op for that config. This causes one to hit a BUG_ON() attempting to mount cpusets to partition cpus. Discovered and diagnosed by Serge Hallyn and Dhaval Giani. Statically initialize the N_*_MEMORY and N_CPU node state masks for !NUMA configurations. This static initialization is required because the node_set_state() function becomes a no-op for !NUMA. Other generic code assumes that these masks are set correctly. Note that in NUMA configurations, these masks will be populated correctly, so don't bother with static initialization. No sense in making assumptions that could be broken down the road, resulting in extra work for someone to debug. Unlikely, perhaps, but who needs the aggravation... Tested on i386 !NUMA by Dhaval Giani. Fixes cpuset BUG. Signed-off-by: Lee Schermerhorn Acked-by: Christoph Lameter Cc: "Serge E. Hallyn" Signed-off-by: Andrew Morton --- mm/page_alloc.c | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletion(-) diff -puN mm/page_alloc.c~memoryless-nodes-generic-management-of-nodemasks-for-various-purposes-fix mm/page_alloc.c --- a/mm/page_alloc.c~memoryless-nodes-generic-management-of-nodemasks-for-various-purposes-fix +++ a/mm/page_alloc.c @@ -51,7 +51,14 @@ */ nodemask_t node_states[NR_NODE_STATES] __read_mostly = { [N_POSSIBLE] = NODE_MASK_ALL, - [N_ONLINE] = { { [0] = 1UL } } + [N_ONLINE] = { { [0] = 1UL } }, +#ifndef CONFIG_NUMA + [N_NORMAL_MEMORY] = { { [0] = 1UL } }, +#ifdef CONFIG_HIGHMEM + [N_HIGH_MEMORY] = { { [0] = 1UL } }, +#endif + [N_CPU] = { { [0] = 1UL } }, +#endif /* NUMA */ }; EXPORT_SYMBOL(node_states); _