From 1b1d860a19bb3bbd9745a30ab943c0ed410c1c4e Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 30 Jan 2008 13:30:15 +0100
Subject: [PATCH] --- yaml --- r: 79740 b: refs/heads/master c:
 3c6bb07ac1b4174318606a26f0de8ceb9f6d8133 h: refs/heads/master v: v3

---
 [refs]                             |  2 +-
 trunk/arch/x86/kernel/apic_64.c    |  4 ++--
 trunk/arch/x86/kernel/smpboot_64.c | 11 ++++++-----
 trunk/include/asm-x86/apic_64.h    |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/[refs] b/[refs]
index 445dbb964c6e..fe77ddfc860b 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 37e650c7c8a27de533d409b53c29f4135dcc7af6
+refs/heads/master: 3c6bb07ac1b4174318606a26f0de8ceb9f6d8133
diff --git a/trunk/arch/x86/kernel/apic_64.c b/trunk/arch/x86/kernel/apic_64.c
index dfeda91fa80c..3de3764a862c 100644
--- a/trunk/arch/x86/kernel/apic_64.c
+++ b/trunk/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/trunk/arch/x86/kernel/smpboot_64.c b/trunk/arch/x86/kernel/smpboot_64.c
index 8147b7d4db63..b36d32ff0b39 100644
--- a/trunk/arch/x86/kernel/smpboot_64.c
+++ b/trunk/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/trunk/include/asm-x86/apic_64.h b/trunk/include/asm-x86/apic_64.h
index b5f850f25114..7bfad0224178 100644
--- a/trunk/include/asm-x86/apic_64.h
+++ b/trunk/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)
 {