---

yaml --- r: 42671 b: refs/heads/master c: 7c309a6 h: refs/heads/master i: 42669: 51d662d 42667: d2b92c9 42663: 240a2c4 42655: 515a99d v: v3
git-mirror · Dec 7, 2006 · 78d0c09 · 78d0c09
1 parent dcb1bd7
commit 78d0c09
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a120586873d3d64de93bd6d593d237e131994e58
+refs/heads/master: 7c309a64d6afa90a0a07813c836ba480aeaeca8c
diff --git a/trunk/mm/bootmem.c b/trunk/mm/bootmem.c
@@ -196,6 +196,10 @@ __alloc_bootmem_core(struct bootmem_data *bdata, unsigned long size,
 	if (limit && bdata->node_boot_start >= limit)
 		return NULL;
 
+	/* on nodes without memory - bootmem_map is NULL */
+	if (!bdata->node_bootmem_map)
+		return NULL;
+
 	end_pfn = bdata->node_low_pfn;
 	limit = PFN_DOWN(limit);
 	if (limit && end_pfn > limit)