From 5d71a9b98fd0f73cdc0b11f0ffbd4f90370b7d35 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Wed, 22 Jul 2009 09:59:35 -0700
Subject: [PATCH] --- yaml --- r: 155823 b: refs/heads/master c:
 2cb078603abb612e3bcd428fb8122c3d39e08832 h: refs/heads/master i:   155821:
 f85ab2f11b5795b41a9f3dd190bf96a8853b5145   155819:
 ccbf5b6a5241d240bb2f3076fdd0d2028b0cb8e2   155815:
 79f7191c77443d0e09910456c31dfc6feb2e0721   155807:
 91c1e244abc4713e47ee75ef7eb3a830211ae4ea v: v3

---
 [refs]                          | 2 +-
 trunk/arch/x86/kernel/cpu/amd.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index a96a398cce89..1b0fbaa683ba 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6effa8f6fc786f00e3a23eae605e0f2e8e748faa
+refs/heads/master: 2cb078603abb612e3bcd428fb8122c3d39e08832
diff --git a/trunk/arch/x86/kernel/cpu/amd.c b/trunk/arch/x86/kernel/cpu/amd.c
index 28e5f5956042..e2485b03f1cf 100644
--- a/trunk/arch/x86/kernel/cpu/amd.c
+++ b/trunk/arch/x86/kernel/cpu/amd.c
@@ -356,7 +356,7 @@ static void __cpuinit early_init_amd(struct cpuinfo_x86 *c)
 #endif
 #if defined(CONFIG_X86_LOCAL_APIC) && defined(CONFIG_PCI)
 	/* check CPU config space for extended APIC ID */
-	if (c->x86 >= 0xf) {
+	if (cpu_has_apic && c->x86 >= 0xf) {
 		unsigned int val;
 		val = read_pci_config(0, 24, 0, 0x68);
 		if ((val & ((1 << 17) | (1 << 18))) == ((1 << 17) | (1 << 18)))