i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
PATCH 2/6 i386/x86-64: Fix ACPI disabled LAPIC handling mismerge
The patch I submitted earlier to fix disabled LAPIC handling in ACPI was mismerged for some reason I still don't quite understand. Parts of it was applied to the wrong function.
This patch fixes it up.
Signed-off-by Andi Kleen <[email protected]>
--- arch/i386/kernel/acpi/boot.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletion(-)
arch/i386/kernel/acpi/boot.c +4 -1
@@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned longunsigned long i;int config_size; -if (!phys_addr || !size || !cpu_has_apic) +if (!phys_addr || !size)return -EINVAL ; mcfg = (struct acpi_table_mcfg *)__acpi_map_table (phys_addr, size);
@@ -1102,6 +1102,9 @@ int __init acpi_boot_table_init(void)dmi_check_system (acpi_dmi_table);#endif +if (!cpu_has_apic) +return -ENODEV ; +/* * If acpi_disabled, bail out * One exception: acpi=ht continues far enough to enumerate LAPICs