1 files changed, 5 insertions, 20 deletions

diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index ddc392bee243..f2a234b390e8 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -429,8 +429,8 @@ static void inquire_remote_apic(int apicid)
  */
 static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int start_rip)
 {
-        unsigned long send_status = 0, accept_status = 0;
-        int maxlvt, timeout, num_starts, j;
+        unsigned long send_status, accept_status = 0;
+        int maxlvt, num_starts, j;
 
         Dprintk("Asserting INIT.\n");
 
@@ -446,12 +446,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
                                 | APIC_DM_INIT);
 
         Dprintk("Waiting for send to finish...\n");
-        timeout = 0;
-        do {
-                Dprintk("+");
-                udelay(100);
-                send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;
-        } while (send_status && (timeout++ < 1000));
+        send_status = safe_apic_wait_icr_idle();
 
         mdelay(10);
 
@@ -464,12 +459,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
         apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);
 
         Dprintk("Waiting for send to finish...\n");
-        timeout = 0;
-        do {
-                Dprintk("+");
-                udelay(100);
-                send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;
-        } while (send_status && (timeout++ < 1000));
+        send_status = safe_apic_wait_icr_idle();
 
         mb();
         atomic_set(&init_deasserted, 1);
@@ -508,12 +498,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
                 Dprintk("Startup point 1.\n");
 
                 Dprintk("Waiting for send to finish...\n");
-                timeout = 0;
-                do {
-                        Dprintk("+");
-                        udelay(100);
-                        send_status = apic_read(APIC_ICR) & APIC_ICR_BUSY;
-                } while (send_status && (timeout++ < 1000));
+                send_status = safe_apic_wait_icr_idle();
 
                 /*
                  * Give the other CPU some time to accept the IPI.