[UBUNTU: acpi/boot] Fix noapic for acpi.

[Chuck Short]

Stolen from upstream.

Signed-off-by: Chuck Short <zulcss at gmail.com>
-------------- next part --------------
From nobody Mon Sep 17 00:00:00 2001
From: Chuck Short <chuck at maggie.(none)>
Date: Sat, 24 Jun 2006 10:52:21 -0400
Subject: [PATCH] [UBUNTU: acpi/boot] Fix noapic for acpi.

Stolen from upstream.

Signed-off-by: Chuck Short <zulcss at gmail.com>

---

 arch/i386/kernel/acpi/boot.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

07ced8beb4e0cef213f33e614223cbb3f909fe83
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index a2b9074..706ba7a 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(unsign
 {
 	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);
@@ -750,6 +750,8 @@ static int __init acpi_parse_madt_ioapic
 	if (acpi_disabled || acpi_noirq) {
 		return -ENODEV;
 	}
+	if (!cpu_has_apic)
+		return -ENODEV;
 
 	/*
 	 * if "noapic" boot option, don't look for IO-APICs
-- 
1.3.3