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

Commit 9cfda2c9 authored by Andi Kleen's avatar Andi Kleen Committed by Len Brown
Browse files

[ACPI] fix "nolapic" flag in ACPI mode 



Signed-off-by: default avatarLen Brown <len.brown@intel.com>
parent 5d5d7727

arch/i386/kernel/acpi/boot.c

+4 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size) 
{

	struct acpi_table_madt *madt = NULL;



	if (!phys_addr || !size)

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

		return -EINVAL;



	madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@ -751,6 +751,9 @@ static int __init acpi_parse_madt_ioapic_entries(void) 
		return -ENODEV;

	}



	if (!cpu_has_apic) 

		return -ENODEV;



	/*

	 * if "noapic" boot option, don't look for IO-APICs

	 */