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

Commit 0fcd2709 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86-64/i386: Don't process APICs/IO-APICs in ACPI when APIC is disabled. 



When nolapic was passed or the local APIC was disabled
for another reason ACPI would still parse the IO-APICs
until these were explicitely disabled with noapic.

Usually this resulted in a non booting configuration unless
"nolapic noapic" was used.

I also disabled the local APIC parsing in this case, although
that's only cosmetic (suppresses a few printks)

This hopefully makes nolapic work in all cases.

Cc: Len Brown <len.brown@intel.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 88dd9c16

arch/i386/kernel/acpi/boot.c

+4 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size) 
	unsigned long i;

	int config_size;



	if (!phys_addr || !size)

	if (!phys_addr || !size || !cpu_has_apic)

		return -EINVAL;



	mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
@@ -693,6 +693,9 @@ static int __init acpi_parse_madt_lapic_entries(void) 
{

	int count;



	if (!cpu_has_apic)

		return -ENODEV;



	/* 

	 * Note that the LAPIC address is obtained from the MADT (32-bit value)

	 * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).