From af5bd326cf2ad74369dc12a31b16960470b776ed 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: 53894 b: refs/heads/master c:
 8339e9fba33aa3205f541478c413982c0ac5a37f h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86_64/kernel/apic.c | 22 ++++++++++++++++++++++
 trunk/include/asm-x86_64/apic.h |  8 +++-----
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index ae991344cc57..4e92e92c8d83 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2b218dd6199983b120a96bc6531c1b81f4090d8
+refs/heads/master: 8339e9fba33aa3205f541478c413982c0ac5a37f
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c
index 3421f21b6c70..943ec4d1bd8e 100644
--- a/trunk/arch/x86_64/kernel/apic.c
+++ b/trunk/arch/x86_64/kernel/apic.c
@@ -68,6 +68,28 @@ int using_apic_timer __read_mostly = 0;
 
 static void apic_pm_activate(void);
 
+void apic_wait_icr_idle(void)
+{
+	while (apic_read(APIC_ICR) & APIC_ICR_BUSY)
+		cpu_relax();
+}
+
+unsigned int safe_apic_wait_icr_idle(void)
+{
+	unsigned int send_status;
+	int timeout;
+
+	timeout = 0;
+	do {
+		send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;
+		if (!send_status)
+			break;
+		udelay(100);
+	} while (timeout++ < 1000);
+
+	return send_status;
+}
+
 void enable_NMI_through_LVT0 (void * dummy)
 {
 	unsigned int v;
diff --git a/trunk/include/asm-x86_64/apic.h b/trunk/include/asm-x86_64/apic.h
index 2f3b013595ab..45e9fca1febc 100644
--- a/trunk/include/asm-x86_64/apic.h
+++ b/trunk/include/asm-x86_64/apic.h
@@ -2,6 +2,7 @@
 #define __ASM_APIC_H
 
 #include <linux/pm.h>
+#include <linux/delay.h>
 #include <asm/fixmap.h>
 #include <asm/apicdef.h>
 #include <asm/system.h>
@@ -47,11 +48,8 @@ static __inline unsigned int apic_read(unsigned long reg)
 	return *((volatile unsigned int *)(APIC_BASE+reg));
 }
 
-static __inline__ void apic_wait_icr_idle(void)
-{
-	while (apic_read( APIC_ICR ) & APIC_ICR_BUSY)
-		cpu_relax();
-}
+extern void apic_wait_icr_idle(void);
+extern unsigned int safe_apic_wait_icr_idle(void);
 
 static inline void ack_APIC_irq(void)
 {