[PATCH] x86: do not free zero sized per cpu areas
in [Kernel]
|
Prev: Infinite loop on boot in free_early_partial due to start==end on tip/master
Next: ACPI _LID failures
From: Yinghai Lu on 19 Mar 2010 15:30 From: Ian Campbell <ian.campbell(a)citrix.com> This avoids an infinite loop in free_early_partial(). Add a warning to free_early_partial to catch future problems. Signed-off-by: Ian Campbell <ian.campbell(a)citrix.com> Signed-off-by: Yinghai Lu <yinghai(a)kernel.org> Cc: Peter Zijlstra <peterz(a)infradead.org> Cc: Ingo Molnar <mingo(a)elte.hu> --- arch/x86/kernel/setup_percpu.c | 3 ++- kernel/early_res.c | 5 +++++ 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index ef6370b..89a3205 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c @@ -140,7 +140,8 @@ static void __init pcpu_fc_free(void *ptr, size_t size) #ifdef CONFIG_NO_BOOTMEM u64 start = __pa(ptr); u64 end = start + size; - free_early_partial(start, end); + if (start < end) + free_early_partial(start, end); #else free_bootmem(__pa(ptr), size); #endif diff --git a/kernel/early_res.c b/kernel/early_res.c index 3cb2c66..f3a861b 100644 --- a/kernel/early_res.c +++ b/kernel/early_res.c @@ -333,6 +333,11 @@ void __init free_early_partial(u64 start, u64 end) struct early_res *r; int i; + if (WARN_ONCE(start >= end, + "free_early_partial got wrong start/end %#llx/%#llx\n", + start, end)) + return; + try_next: i = find_overlapped_early(start, end); if (i >= max_early_res) -- 1.5.6.5 -- 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/ |