From 78d0c09ff642fdd34d36db7384a0b46b27581b79 Mon Sep 17 00:00:00 2001 From: Christian Krafft Date: Wed, 6 Dec 2006 20:32:41 -0800 Subject: [PATCH] --- yaml --- r: 42671 b: refs/heads/master c: 7c309a64d6afa90a0a07813c836ba480aeaeca8c h: refs/heads/master i: 42669: 51d662da86fa1b9bd5efe8c505397f8025d6653c 42667: d2b92c96476a6afe9fb8a0fbed48ce66e2e25b0b 42663: 240a2c4ea6772323236d6cae5b4b29381af549ba 42655: 515a99de3c2a7ec1feb95f28e471fadc30110fd4 v: v3 --- [refs] | 2 +- trunk/mm/bootmem.c | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 2a52c4f7447d..d1c84e45001c 100644 --- 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 index d53112fcb404..94253428f091 100644 --- 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)