diff options
Diffstat (limited to 'arch/arm/kernel/smp.c')
-rw-r--r-- | arch/arm/kernel/smp.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c index 13396d3d600e..3138d8ea9e55 100644 --- a/arch/arm/kernel/smp.c +++ b/arch/arm/kernel/smp.c | |||
@@ -225,7 +225,7 @@ void __cpu_die(unsigned int cpu) | |||
225 | pr_err("CPU%u: cpu didn't die\n", cpu); | 225 | pr_err("CPU%u: cpu didn't die\n", cpu); |
226 | return; | 226 | return; |
227 | } | 227 | } |
228 | printk(KERN_NOTICE "CPU%u: shutdown\n", cpu); | 228 | pr_notice("CPU%u: shutdown\n", cpu); |
229 | 229 | ||
230 | /* | 230 | /* |
231 | * platform_cpu_kill() is generally expected to do the powering off | 231 | * platform_cpu_kill() is generally expected to do the powering off |
@@ -235,7 +235,7 @@ void __cpu_die(unsigned int cpu) | |||
235 | * the requesting CPU and the dying CPU actually losing power. | 235 | * the requesting CPU and the dying CPU actually losing power. |
236 | */ | 236 | */ |
237 | if (!platform_cpu_kill(cpu)) | 237 | if (!platform_cpu_kill(cpu)) |
238 | printk("CPU%u: unable to kill\n", cpu); | 238 | pr_err("CPU%u: unable to kill\n", cpu); |
239 | } | 239 | } |
240 | 240 | ||
241 | /* | 241 | /* |
@@ -351,7 +351,7 @@ asmlinkage void secondary_start_kernel(void) | |||
351 | 351 | ||
352 | cpu_init(); | 352 | cpu_init(); |
353 | 353 | ||
354 | printk("CPU%u: Booted secondary processor\n", cpu); | 354 | pr_info("CPU%u: Booted secondary processor\n", cpu); |
355 | 355 | ||
356 | preempt_disable(); | 356 | preempt_disable(); |
357 | trace_hardirqs_off(); | 357 | trace_hardirqs_off(); |
@@ -387,8 +387,8 @@ asmlinkage void secondary_start_kernel(void) | |||
387 | 387 | ||
388 | void __init smp_cpus_done(unsigned int max_cpus) | 388 | void __init smp_cpus_done(unsigned int max_cpus) |
389 | { | 389 | { |
390 | printk(KERN_INFO "SMP: Total of %d processors activated.\n", | 390 | pr_info("SMP: Total of %d processors activated.\n", |
391 | num_online_cpus()); | 391 | num_online_cpus()); |
392 | 392 | ||
393 | hyp_mode_check(); | 393 | hyp_mode_check(); |
394 | } | 394 | } |
@@ -521,7 +521,7 @@ static void ipi_cpu_stop(unsigned int cpu) | |||
521 | if (system_state == SYSTEM_BOOTING || | 521 | if (system_state == SYSTEM_BOOTING || |
522 | system_state == SYSTEM_RUNNING) { | 522 | system_state == SYSTEM_RUNNING) { |
523 | raw_spin_lock(&stop_lock); | 523 | raw_spin_lock(&stop_lock); |
524 | printk(KERN_CRIT "CPU%u: stopping\n", cpu); | 524 | pr_crit("CPU%u: stopping\n", cpu); |
525 | dump_stack(); | 525 | dump_stack(); |
526 | raw_spin_unlock(&stop_lock); | 526 | raw_spin_unlock(&stop_lock); |
527 | } | 527 | } |
@@ -615,8 +615,8 @@ void handle_IPI(int ipinr, struct pt_regs *regs) | |||
615 | break; | 615 | break; |
616 | 616 | ||
617 | default: | 617 | default: |
618 | printk(KERN_CRIT "CPU%u: Unknown IPI message 0x%x\n", | 618 | pr_crit("CPU%u: Unknown IPI message 0x%x\n", |
619 | cpu, ipinr); | 619 | cpu, ipinr); |
620 | break; | 620 | break; |
621 | } | 621 | } |
622 | 622 | ||