From dbf81060dcfb8a8bc5aa10b9b697b8b84579f1f0 Mon Sep 17 00:00:00 2001 From: Yinghai Lu Date: Wed, 22 Apr 2009 14:19:27 -0700 Subject: [PATCH] --- yaml --- r: 144190 b: refs/heads/master c: 4c31e92b97b6d7e7b19ee5e54a22571ffdebb305 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/numa_64.c | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index bbe9768c4599..c3c861559e53 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5428e950ad42640f00092949fd17e356dfdeafa +refs/heads/master: 4c31e92b97b6d7e7b19ee5e54a22571ffdebb305 diff --git a/trunk/arch/x86/mm/numa_64.c b/trunk/arch/x86/mm/numa_64.c index d73aaa892371..2d05a12029dc 100644 --- a/trunk/arch/x86/mm/numa_64.c +++ b/trunk/arch/x86/mm/numa_64.c @@ -188,6 +188,9 @@ void __init setup_node_bootmem(int nodeid, unsigned long start, const int pgdat_size = roundup(sizeof(pg_data_t), PAGE_SIZE); int nid; + if (!end) + return; + start = roundup(start, ZONE_ALIGN); printk(KERN_INFO "Bootmem setup node %d %016lx-%016lx\n", nodeid,