x86: use u32 for safe_apic_wait_icr_idle()

Preperatory patch for merging apic headers.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

3 files changed, 9 insertions, 8 deletions

diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index dfeda91fa80..3de3764a862 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -135,9 +135,9 @@ void apic_wait_icr_idle(void)
                 cpu_relax();
 }
 
-unsigned int safe_apic_wait_icr_idle(void)
+u32 safe_apic_wait_icr_idle(void)
 {
-        unsigned int send_status;
+        u32 send_status;
         int timeout;
 
         timeout = 0;
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c
index 8147b7d4db6..b36d32ff0b3 100644
--- a/arch/x86/kernel/smpboot_64.c
+++ b/arch/x86/kernel/smpboot_64.c
@@ -384,19 +384,20 @@ static void inquire_remote_apic(int apicid)
         unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 };
         char *names[] = { "ID", "VERSION", "SPIV" };
         int timeout;
-        unsigned int status;
+        u32 status;
 
         printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid);
 
         for (i = 0; i < ARRAY_SIZE(regs); i++) {
-                printk("... APIC #%d %s: ", apicid, names[i]);
+                printk(KERN_INFO "... APIC #%d %s: ", apicid, names[i]);
 
                 /*
                  * Wait for idle.
                  */
                 status = safe_apic_wait_icr_idle();
                 if (status)
-                        printk("a previous APIC delivery may have failed\n");
+                        printk(KERN_CONT
+                               "a previous APIC delivery may have failed\n");
 
                 apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
                 apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]);
@@ -410,10 +411,10 @@ static void inquire_remote_apic(int apicid)
                 switch (status) {
                 case APIC_ICR_RR_VALID:
                         status = apic_read(APIC_RRR);
-                        printk("%08x\n", status);
+                        printk(KERN_CONT "%08x\n", status);
                         break;
                 default:
-                        printk("failed\n");
+                        printk(KERN_CONT "failed\n");
                 }
         }
 }
diff --git a/include/asm-x86/apic_64.h b/include/asm-x86/apic_64.h
index b5f850f2511..7bfad022417 100644
--- a/include/asm-x86/apic_64.h
+++ b/include/asm-x86/apic_64.h
@@ -49,7 +49,7 @@ static __inline unsigned int apic_read(unsigned long reg)
 }
 
 extern void apic_wait_icr_idle(void);
-extern unsigned int safe_apic_wait_icr_idle(void);
+extern u32 safe_apic_wait_icr_idle(void);
 
 static inline void ack_APIC_irq(void)
 {