From 6ffa75c2f5baf4a0ed7540162c1484ce194b61bd Mon Sep 17 00:00:00 2001
From: Andi Kleen <ak@suse.de>
Date: Tue, 11 Apr 2006 12:54:36 +0200
Subject: [PATCH] --- yaml --- r: 25619 b: refs/heads/master c:
 0fcd270901f731342df64816f277ae7adbd67130 h: refs/heads/master i:   25617:
 ea96fd3f616a7bd83d7fea0af11a89465507fd98   25615:
 fe86f0fdfce0fe7e2de127e8310d3f75f3be95fa v: v3

---
 [refs]                             | 2 +-
 trunk/arch/i386/kernel/acpi/boot.c | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 036bfcd3bb67..f97826900bf6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 88dd9c16cecbd105bbe7711b6120333f6f7b5474
+refs/heads/master: 0fcd270901f731342df64816f277ae7adbd67130
diff --git a/trunk/arch/i386/kernel/acpi/boot.c b/trunk/arch/i386/kernel/acpi/boot.c
index 8dab3527bc97..030a0007a4e0 100644
--- a/trunk/arch/i386/kernel/acpi/boot.c
+++ b/trunk/arch/i386/kernel/acpi/boot.c
@@ -168,7 +168,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
 	unsigned long i;
 	int config_size;
 
-	if (!phys_addr || !size)
+	if (!phys_addr || !size || !cpu_has_apic)
 		return -EINVAL;
 
 	mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
@@ -693,6 +693,9 @@ static int __init acpi_parse_madt_lapic_entries(void)
 {
 	int count;
 
+	if (!cpu_has_apic)
+		return -ENODEV;
+
 	/* 
 	 * Note that the LAPIC address is obtained from the MADT (32-bit value)
 	 * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).