commit 9cfda2c94df61c9f859b474abe774c65a4464d0a
author Andi Kleen <ak@suse.de> Mon Mar 27 02:24:32 2006 -0500
committer Len Brown <len.brown@intel.com> Mon Mar 27 02:33:00 2006 -0500
tree d6fa93519c2182f89d36c59dd9176dec264e8594
parent 5d5d7727a8cde78f798ecf04bac8031eff536f9d

[ACPI] fix "nolapic" flag in ACPI mode

Signed-off-by: Len Brown <len.brown@intel.com>

arch/i386/kernel/acpi/boot.c

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 0330661..d0980c7 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -215,7 +215,7 @@
 {
 	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 @@
 		return -ENODEV;
 	}
 
+	if (!cpu_has_apic) 
+		return -ENODEV;
+
 	/*
 	 * if "noapic" boot option, don't look for IO-APICs
 	 */