diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:35 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-05 21:49:35 +0100 |
| commit | 28e93a005b65cc5b4f569642e9c7903618ea5fe1 (patch) | |
| tree | 3c98b8dc457b05b290ad640c413e453a264739bf /arch/x86/mm/numa_32.c | |
| parent | caab36b593b44c97e3c7707c6a8054b320f8d622 (diff) | |
| parent | ed26dbe5ae045e5bf95c6dc27497397a3fde52e1 (diff) | |
Merge branch 'x86/mm' into x86/core
Diffstat (limited to 'arch/x86/mm/numa_32.c')
| -rw-r--r-- | arch/x86/mm/numa_32.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c index 451fe95a035..3daefa04ace 100644 --- a/arch/x86/mm/numa_32.c +++ b/arch/x86/mm/numa_32.c @@ -416,10 +416,11 @@ void __init initmem_init(unsigned long start_pfn, for_each_online_node(nid) propagate_e820_map_node(nid); - for_each_online_node(nid) + for_each_online_node(nid) { memset(NODE_DATA(nid), 0, sizeof(struct pglist_data)); + NODE_DATA(nid)->bdata = &bootmem_node_data[nid]; + } - NODE_DATA(0)->bdata = &bootmem_node_data[0]; setup_bootmem_allocator(); } |