From 62d00e5ecb87b92ba5cbf6f7d6ba5b848e0ea69e Mon Sep 17 00:00:00 2001
From: Fernando Luis VazquezCao <fernando@oss.ntt.co.jp>
Date: Wed, 2 May 2007 19:27:17 +0200
Subject: [PATCH] --- yaml --- r: 53897 b: refs/heads/master c:
 4312fa8157f5ebdaf36e615cf40f9d7a6137a22c h: refs/heads/master i:   53895:
 1ac93ce76d98b72e4e9b25b6cb26bc152ac991a4 v: v3

---
 [refs]                           | 2 +-
 trunk/arch/i386/kernel/smpboot.c | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 86de1b168d95..628cd9ee8be4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea8c733b98b73289421ed8f8fc15cfbce3adc3bc
+refs/heads/master: 4312fa8157f5ebdaf36e615cf40f9d7a6137a22c
diff --git a/trunk/arch/i386/kernel/smpboot.c b/trunk/arch/i386/kernel/smpboot.c
index 94dce14a1b37..a768eceeac37 100644
--- a/trunk/arch/i386/kernel/smpboot.c
+++ b/trunk/arch/i386/kernel/smpboot.c
@@ -521,7 +521,8 @@ static inline void __inquire_remote_apic(int apicid)
 {
 	int i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
 	char *names[] = { "ID", "VERSION", "SPIV" };
-	int timeout, status;
+	int timeout;
+	unsigned long status;
 
 	printk("Inquiring remote APIC #%d...\n", apicid);
 
@@ -531,7 +532,9 @@ static inline void __inquire_remote_apic(int apicid)
 		/*
 		 * Wait for idle.
 		 */
-		apic_wait_icr_idle();
+		status = safe_apic_wait_icr_idle();
+		if (status)
+			printk("a previous APIC delivery may have failed\n");
 
 		apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
 		apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]);