From 4030a1c6d938c1db5decf75122055af5f439e729 Mon Sep 17 00:00:00 2001
From: Andy Whitcroft <apw@shadowen.org>
Date: Tue, 20 May 2008 11:01:19 +0100
Subject: [PATCH] --- yaml --- r: 99308 b: refs/heads/master c:
 84d6bd0e272e6eace1e7e4c501f32bddfb665bb2 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/arch/x86/mm/discontig_32.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index bd9345b2a1b8..77e7621895e0 100644
--- 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
index 026201f143a8..435c343c14bc 100644
--- 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));