From c865ea766ba8e7ede53a2885f4e2f3021611148f Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 26 Nov 2007 20:42:20 +0100
Subject: [PATCH] --- yaml --- r: 74159 b: refs/heads/master c:
 f44d9efd3510776216938fef84adc99cc0e12412 h: refs/heads/master i:   74157:
 dbce20cda36ce6d569b96afc8ad2932758fa667f   74155:
 4be573bd3e0350b62638377e99314a08bc2053f2   74151:
 c0956dcf60b47064223b19d35526973198f5221b   74143:
 9181e8c5cff3a6c62e6775e1b631bc7da47354bf v: v3

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

diff --git a/[refs] b/[refs]
index b5126c065bc7..3cefd9c8ebe2 100644
--- 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
index 08b07c176962..96986b46bc85 100644
--- 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.