[PATCH] [REGRESSION 2.6.33] x86: Handle overlapping mptables
in [Kernel]
|
Prev: linux-next: build failure after merge of the final tree (net tree related)
Next: padata: section cleanup
From: Andi Kleen on 29 Mar 2010 03:50 [REGRESSION] x86: Handle overlapping mptables We found a system where the MP table MPC and MPF structures overlap. That doesn't really matter because the mptable is not used anyways with ACPI, but it leads to a panic in the early allocator due to the overlapping reservations in 2.6.33. Earlier kernels handled this without problems. Simply change these reservations to reserve_early_overlap_ok to avoid the panic. Reported-by: Thomas Renninger <trenn(a)suse.de> Tested-by: Thomas Renninger <trenn(a)suse.de> Signed-off-by: Andi Kleen <ak(a)linux.intel.com> --- arch/x86/kernel/cpu/perfctr-watchdog.c | 10 ++++++++-- arch/x86/kernel/mpparse.c | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) Index: linux-2.6.33-ak/arch/x86/kernel/mpparse.c =================================================================== --- linux-2.6.33-ak.orig/arch/x86/kernel/mpparse.c +++ linux-2.6.33-ak/arch/x86/kernel/mpparse.c @@ -664,7 +664,7 @@ static void __init smp_reserve_memory(st { unsigned long size = get_mpc_size(mpf->physptr); - reserve_early(mpf->physptr, mpf->physptr+size, "MP-table mpc"); + reserve_early_overlap_ok(mpf->physptr, mpf->physptr+size, "MP-table mpc"); } static int __init smp_scan_config(unsigned long base, unsigned long length) @@ -693,7 +693,7 @@ static int __init smp_scan_config(unsign mpf, (u64)virt_to_phys(mpf)); mem = virt_to_phys(mpf); - reserve_early(mem, mem + sizeof(*mpf), "MP-table mpf"); + reserve_early_overlap_ok(mem, mem + sizeof(*mpf), "MP-table mpf"); if (mpf->physptr) smp_reserve_memory(mpf); -- 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/ |