Skip to contentSkip to conversation

i386/x86-64: Fix ACPI disabled LAPIC handling mismerge

PATCH In review Andi Kleen 1 participant 1 message Apr 28, 2006

lore
Share & tools
lore

Andi Kleen

author
#0 lore raw

PATCH 2/4 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.

---
 arch/i386/kernel/acpi/boot.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)
arch/i386/kernel/acpi/boot.c +4 -1
Index: linux/arch/i386/kernel/acpi/boot.c
===================================================================
@@ -215,7 +215,7 @@ static int __init acpi_parse_madt(unsign
 {
 	struct acpi_table_madt *madt = NULL;
 
-	if (!phys_addr || !size || !cpu_has_apic)
+	if (!phys_addr || !size)
 		return -EINVAL;
 
 	madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
@@ -1151,6 +1151,9 @@ int __init acpi_boot_init(void)
 
 	acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
 
+	if (!cpu_has_apic)
+		return -ENODEV;
+
 	/*
 	 * set sci_int and PM timer address
 	 */