diff options
| author | Yinghai Lu <yinghai@kernel.org> | 2009-11-21 00:23:37 -0800 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-23 10:00:48 +0100 |
| commit | 021428ad1418cf3c386a1a0157140c3ea29b17ef (patch) | |
| tree | 52b77975afb95554ac195909879debe091061361 /arch/x86/mm/numa_64.c | |
| parent | 44280733e71ad15377735b42d8538c109c94d7e3 (diff) | |
| download | linux-021428ad1418cf3c386a1a0157140c3ea29b17ef.tar.gz linux-021428ad1418cf3c386a1a0157140c3ea29b17ef.tar.bz2 linux-021428ad1418cf3c386a1a0157140c3ea29b17ef.zip | |
x86, numa, bootmem: Only free bootmem on NUMA failure path
In the NUMA bootmem setup failure path we freed nodedata_phys
incorrectly.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: David Rientjes <rientjes@google.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <4B07A739.3030104@kernel.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/mm/numa_64.c')
| -rw-r--r-- | arch/x86/mm/numa_64.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/x86/mm/numa_64.c b/arch/x86/mm/numa_64.c index 086f98a66d80..3acd870d316a 100644 --- a/arch/x86/mm/numa_64.c +++ b/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; } |