diff options
author | Glauber de Oliveira Costa <gcosta@redhat.com> | 2008-03-19 13:24:57 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:40:59 -0400 |
commit | ba10485c2f5a9482d93b095960cbe7d865d59e04 (patch) | |
tree | 958bc5b1824419fb2fe1696af328fc057b88ad0e /arch/x86/kernel/smpboot_32.c | |
parent | 26c6b5ea5575a5a4886dc45f889e7b783641f2de (diff) |
x86: add loglevel to printks
Add loglevel facilities to printks in __inquire_remote_apic.
the levels are the ones to match x86_64 ones.
Signed-off-by: Glauber Costa <gcosta@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/smpboot_32.c')
-rw-r--r-- | arch/x86/kernel/smpboot_32.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/kernel/smpboot_32.c b/arch/x86/kernel/smpboot_32.c index bea2d328a4f0..8676eec2d00f 100644 --- a/arch/x86/kernel/smpboot_32.c +++ b/arch/x86/kernel/smpboot_32.c | |||
@@ -373,17 +373,18 @@ static inline void __inquire_remote_apic(int apicid) | |||
373 | int timeout; | 373 | int timeout; |
374 | u32 status; | 374 | u32 status; |
375 | 375 | ||
376 | printk("Inquiring remote APIC #%d...\n", apicid); | 376 | printk(KERN_INFO "Inquiring remote APIC #%d...\n", apicid); |
377 | 377 | ||
378 | for (i = 0; i < ARRAY_SIZE(regs); i++) { | 378 | for (i = 0; i < ARRAY_SIZE(regs); i++) { |
379 | printk("... APIC #%d %s: ", apicid, names[i]); | 379 | printk(KERN_INFO "... APIC #%d %s: ", apicid, names[i]); |
380 | 380 | ||
381 | /* | 381 | /* |
382 | * Wait for idle. | 382 | * Wait for idle. |
383 | */ | 383 | */ |
384 | status = safe_apic_wait_icr_idle(); | 384 | status = safe_apic_wait_icr_idle(); |
385 | if (status) | 385 | if (status) |
386 | printk("a previous APIC delivery may have failed\n"); | 386 | printk(KERN_CONT |
387 | "a previous APIC delivery may have failed\n"); | ||
387 | 388 | ||
388 | apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid)); | 389 | apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid)); |
389 | apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]); | 390 | apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]); |
@@ -397,10 +398,10 @@ static inline void __inquire_remote_apic(int apicid) | |||
397 | switch (status) { | 398 | switch (status) { |
398 | case APIC_ICR_RR_VALID: | 399 | case APIC_ICR_RR_VALID: |
399 | status = apic_read(APIC_RRR); | 400 | status = apic_read(APIC_RRR); |
400 | printk("%lx\n", status); | 401 | printk(KERN_CONT "%08x\n", status); |
401 | break; | 402 | break; |
402 | default: | 403 | default: |
403 | printk("failed\n"); | 404 | printk(KERN_CONT "failed\n"); |
404 | } | 405 | } |
405 | } | 406 | } |
406 | } | 407 | } |