X-Git-Url: http://bbs.cooldavid.org/git/?a=blobdiff_plain;f=arch%2Fx86%2Fmm%2Fnuma_32.c;h=809baaaf48b18d9f24f953b602001a562f2769c7;hb=59be5a8e;hp=b20760ca724451b3582e089adbd8f16368ebf071;hpb=53db62a2529280ff216c941d8a2650204547e44a;p=net-next-2.6.git

diff --git a/arch/x86/mm/numa_32.c b/arch/x86/mm/numa_32.c
index b20760ca724..809baaaf48b 100644
--- a/arch/x86/mm/numa_32.c
+++ b/arch/x86/mm/numa_32.c
@@ -418,7 +418,10 @@ void __init initmem_init(unsigned long start_pfn, unsigned long end_pfn,
 
 	for_each_online_node(nid) {
 		memset(NODE_DATA(nid), 0, sizeof(struct pglist_data));
+		NODE_DATA(nid)->node_id = nid;
+#ifndef CONFIG_NO_BOOTMEM
 		NODE_DATA(nid)->bdata = &bootmem_node_data[nid];
+#endif
 	}
 
 	setup_bootmem_allocator();