From eb9301b082fe444cdb28a86c418eb8af59bbae0e Mon Sep 17 00:00:00 2001
From: Yinghai Lu <yinghai@kernel.org>
Date: Sat, 21 Nov 2009 00:23:37 -0800
Subject: [PATCH] --- yaml --- r: 173055 b: refs/heads/master c:
 021428ad1418cf3c386a1a0157140c3ea29b17ef h: refs/heads/master i:   173053:
 82f33120db9787f63f46247ce807b29cce92bc0e   173051:
 4c10c12f59f976f6e2d3a77f8547ee59d755db70   173047:
 7be4fa90ae40b3a23cc9a24dc6ca4da5cad67078   173039:
 2570f09308c5c8004226f54efdf7af3e1b1a741d   173023:
 9b0756edd2cc4a8fa328e7f8abd34d2420406cae   172991:
 0a6e6c245b190283bb9ff16c00b9690e7663d972   172927:
 98369684d1f7a327605c80f800bbcbaa257092fc   172799:
 361162ae0e4d736a3741b5991722df8ff533f99d   172543:
 ebc1ce3b888cf69cf3f0a7a3bbee5450cf89610e   172031:
 34ad129cbe3263332d7c25d3650418a7c72dbeae v: v3

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

diff --git a/[refs] b/[refs]
index 7f995509641e..7f863498f9c9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 44280733e71ad15377735b42d8538c109c94d7e3
+refs/heads/master: 021428ad1418cf3c386a1a0157140c3ea29b17ef
diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c
index 086f98a66d80..3acd870d316a 100644
--- a/trunk/arch/x86/mm/numa_64.c
+++ b/trunk/arch/x86/mm/numa_64.c
@@ -239,8 +239,14 @@ setup_node_bootmem(int nodeid, unsigned long start, unsigned long end)
 	bootmap = early_node_mem(nodeid, bootmap_start, end,
 				 bootmap_pages<<PAGE_SHIFT, PAGE_SIZE);
 	if (bootmap == NULL)  {
-		if (nodedata_phys < start || nodedata_phys >= end)
-			free_bootmem(nodedata_phys, pgdat_size);
+		if (nodedata_phys < start || nodedata_phys >= end) {
+			/*
+			 * only need to free it if it is from other node
+			 * bootmem
+			 */
+			if (nid != nodeid)
+				free_bootmem(nodedata_phys, pgdat_size);
+		}
 		node_data[nodeid] = NULL;
 		return;
 	}