---

yaml --- r: 155823 b: refs/heads/master c: 2cb0786 h: refs/heads/master i: 155821: f85ab2f 155819: ccbf5b6 155815: 79f7191 155807: 91c1e24 v: v3
git-mirror · Jul 22, 2009 · 5d71a9b · 5d71a9b
1 parent d57a931
commit 5d71a9b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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)))