diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-04-22 14:19:27 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-23 09:58:56 +0200 |
| commit | 4c31e92b97b6d7e7b19ee5e54a22571ffdebb305 (patch) | |
| tree | 5c38cbe0d3a324377ca4059abdec616e609aaa41 /arch | |
| parent | c5428e950ad42640f00092949fd17e356dfdeafa (diff) | |
| download | op-kernel-dev-4c31e92b97b6d7e7b19ee5e54a22571ffdebb305.zip op-kernel-dev-4c31e92b97b6d7e7b19ee5e54a22571ffdebb305.tar.gz | |
x86: check boundary in setup_node_bootmem()
Commit dc09855 ("x86/uv: fix init of memory-less nodes") causes a
two sockets system (where node-1 doesn't have RAM installed) to crash.
That commit makes node_possible include cpu nodes that do not have memory.
So check boundary in setup_node_bootmem().
[ Impact: fix boot crash on RAM-less NUMA node system ]
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Jack Steiner <steiner@sgi.com>
LKML-Reference: <49EF89DF.9090404@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/mm/numa_64.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index d73aaa8..2d05a12 100644 --- a/arch/x86/mm/numa_64.c +++ b/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, |
