diff options
Diffstat (limited to 'arch/x86/kernel/smpboot_64.c')
-rw-r--r-- | arch/x86/kernel/smpboot_64.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/smpboot_64.c b/arch/x86/kernel/smpboot_64.c index 8147b7d4db63..b36d32ff0b39 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) | |||
384 | unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; | 384 | unsigned i, regs[] = { APIC_ID >> 4, APIC_LVR >> 4, APIC_SPIV >> 4 }; |
385 | char *names[] = { "ID", "VERSION", "SPIV" }; | 385 | char *names[] = { "ID", "VERSION", "SPIV" }; |
386 | int timeout; | 386 | int timeout; |
387 | unsigned int status; | 387 | u32 status; |
388 | 388 | ||
389 | printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid); | 389 | printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid); |
390 | 390 | ||
391 | for (i = 0; i < ARRAY_SIZE(regs); i++) { | 391 | for (i = 0; i < ARRAY_SIZE(regs); i++) { |
392 | printk("... APIC #%d %s: ", apicid, names[i]); | 392 | printk(KERN_INFO "... APIC #%d %s: ", apicid, names[i]); |
393 | 393 | ||
394 | /* | 394 | /* |
395 | * Wait for idle. | 395 | * Wait for idle. |
396 | */ | 396 | */ |
397 | status = safe_apic_wait_icr_idle(); | 397 | status = safe_apic_wait_icr_idle(); |
398 | if (status) | 398 | if (status) |
399 | printk("a previous APIC delivery may have failed\n"); | 399 | printk(KERN_CONT |
400 | "a previous APIC delivery may have failed\n"); | ||
400 | 401 | ||
401 | apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid)); | 402 | apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid)); |
402 | apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]); | 403 | apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]); |
@@ -410,10 +411,10 @@ static void inquire_remote_apic(int apicid) | |||
410 | switch (status) { | 411 | switch (status) { |
411 | case APIC_ICR_RR_VALID: | 412 | case APIC_ICR_RR_VALID: |
412 | status = apic_read(APIC_RRR); | 413 | status = apic_read(APIC_RRR); |
413 | printk("%08x\n", status); | 414 | printk(KERN_CONT "%08x\n", status); |
414 | break; | 415 | break; |
415 | default: | 416 | default: |
416 | printk("failed\n"); | 417 | printk(KERN_CONT "failed\n"); |
417 | } | 418 | } |
418 | } | 419 | } |
419 | } | 420 | } |