---

yaml --- r: 173055 b: refs/heads/master c: 021428a h: refs/heads/master i: 173053: 82f3312 173051: 4c10c12 173047: 7be4fa9 173039: 2570f09 173023: 9b0756e 172991: 0a6e6c2 172927: 9836968 172799: 361162a 172543: ebc1ce3 172031: 34ad129 v: v3
git-mirror · Nov 23, 2009 · eb9301b · eb9301b
1 parent 9dbd0de
commit eb9301b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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;
 	}