---

yaml --- r: 99308 b: refs/heads/master c: 84d6bd0 h: refs/heads/master v: v3
git-mirror · May 20, 2008 · 4030a1c · 4030a1c
1 parent 30af18d
commit 4030a1c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b9ada4281c48076bdb252813be24ddb57e17cade
+refs/heads/master: 84d6bd0e272e6eace1e7e4c501f32bddfb665bb2
diff --git a/trunk/arch/x86/mm/discontig_32.c b/trunk/arch/x86/mm/discontig_32.c
@@ -156,7 +156,7 @@ static void __init propagate_e820_map_node(int nid)
  */
 static void __init allocate_pgdat(int nid)
 {
-	if (nid && node_has_online_mem(nid))
+	if (nid && node_has_online_mem(nid) && node_remap_start_vaddr[nid])
 		NODE_DATA(nid) = (pg_data_t *)node_remap_start_vaddr[nid];
 	else {
 		NODE_DATA(nid) = (pg_data_t *)(pfn_to_kaddr(min_low_pfn));