Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909fc87b authored by Andi Kleen's avatar Andi Kleen Committed by H. Peter Anvin
Browse files

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: default avatarThomas Renninger <trenn@suse.de>
Tested-by: default avatarThomas Renninger <trenn@suse.de>
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
LKML-Reference: <20100329074111.GA22821@basil.fritz.box>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
Cc: <stable@kernel.org>
parent 9f3a5f52

arch/x86/kernel/mpparse.c

+2 −2
Original line number Diff line number Diff line
@@ -664,7 +664,7 @@ static void __init smp_reserve_memory(struct mpf_intel *mpf) 
{

	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(unsigned long base, unsigned long length) 
			       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);