---

yaml --- r: 74159 b: refs/heads/master c: f44d9ef h: refs/heads/master i: 74157: dbce20c 74155: 4be573b 74151: c0956dc 74143: 9181e8c v: v3
git-mirror · Nov 26, 2007 · c865ea7 · c865ea7
1 parent fc4dd33
commit c865ea7
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: 52bfb36050c8529d9031d2c2513b281a360922ec
+refs/heads/master: f44d9efd3510776216938fef84adc99cc0e12412
diff --git a/trunk/arch/x86/kernel/apic_32.c b/trunk/arch/x86/kernel/apic_32.c
@@ -789,7 +789,7 @@ void __init sync_Arb_IDs(void)
 	 * Unsupported on P4 - see Intel Dev. Manual Vol. 3, Ch. 8.6.1 And not
 	 * needed on AMD.
 	 */
-	if (modern_apic())
+	if (modern_apic() || boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
 		return;
 	/*
 	 * Wait for idle.