[tip:x86/mm] x86, numa, bootmem: Only free bootmem on NUMA failure path
in [Kernel]
|
Prev: MIPS: Add a high resolution sched_clock() via cnt32_to_63().
Next: x86, crypto, Use gas macro for PCLMULQDQ-NI and PSHUFB
From: tip-bot for Yinghai Lu on 23 Nov 2009 07:00 Commit-ID: 021428ad1418cf3c386a1a0157140c3ea29b17ef Gitweb: http://git.kernel.org/tip/021428ad1418cf3c386a1a0157140c3ea29b17ef Author: Yinghai Lu <yinghai(a)kernel.org> AuthorDate: Sat, 21 Nov 2009 00:23:37 -0800 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Mon, 23 Nov 2009 10:00:48 +0100 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(a)kernel.org> Cc: Thomas Gleixner <tglx(a)linutronix.de> Cc: H. Peter Anvin <hpa(a)zytor.com> Cc: Rusty Russell <rusty(a)rustcorp.com.au> Cc: David Rientjes <rientjes(a)google.com> Cc: Andrew Morton <akpm(a)linux-foundation.org> LKML-Reference: <4B07A739.3030104(a)kernel.org> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- 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 086f98a..3acd870 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; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |