From: Andi Kleen <ak@suse.de>
Date: Mon, 27 Mar 2006 07:24:32 +0000 (-0500)
Subject: [ACPI] fix "nolapic" flag in ACPI mode
X-Git-Tag: v2.6.18-rc1~1081^2~19^2~14^2
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9cfda2c94df61c9f859b474abe774c65a4464d0a;p=linux-2.6

[ACPI] fix "nolapic" flag in ACPI mode

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

diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 033066176b..d0980c79a5 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -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
 	 */