From: Joshua Kinard <kumba@xxxxxxxxxx> In arch/mips/kernel/cpu-bugs64.c, replace initial printk's in three bug-checking functions with pr_info and replace several continuation printk's with pr_info/pr_cont calls to avoid kernel log output like this: [ 0.899065] Checking for the daddi bug... [ 0.899098] no. This makes the output appear correctly: [ 0.898643] Checking for the daddi bug... no. Signed-off-by: Joshua Kinard <kumba@xxxxxxxxxx> --- arch/mips/kernel/cpu-bugs64.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/arch/mips/kernel/cpu-bugs64.c b/arch/mips/kernel/cpu-bugs64.c index a378e44688f5..d4483551a926 100644 --- a/arch/mips/kernel/cpu-bugs64.c +++ b/arch/mips/kernel/cpu-bugs64.c @@ -122,7 +122,7 @@ static inline void check_mult_sh(void) long v1[8], v2[8], w[8]; int bug, fix, i; - printk("Checking for the multiply/shift bug... "); + pr_info("Checking for the multiply/shift bug... "); /* * Testing discovered false negatives for certain code offsets @@ -148,11 +148,11 @@ static inline void check_mult_sh(void) bug = 1; if (bug == 0) { - printk("no.\n"); + pr_cont("no.\n"); return; } - printk("yes, workaround... "); + pr_cont("yes, workaround... "); fix = 1; for (i = 0; i < 8; i++) @@ -160,11 +160,11 @@ static inline void check_mult_sh(void) fix = 0; if (fix == 1) { - printk("yes.\n"); + pr_cont("yes.\n"); return; } - printk("no.\n"); + pr_cont("no.\n"); panic(bug64hit, !R4000_WAR ? r4kwar : nowar); } @@ -187,7 +187,7 @@ static inline void check_daddi(void) void *handler; long v, tmp; - printk("Checking for the daddi bug... "); + pr_info("Checking for the daddi bug... "); local_irq_save(flags); handler = set_except_vector(EXCCODE_OV, handle_daddi_ov); @@ -218,11 +218,11 @@ static inline void check_daddi(void) local_irq_restore(flags); if (daddi_ov) { - printk("no.\n"); + pr_cont("no.\n"); return; } - printk("yes, workaround... "); + pr_cont("yes, workaround... "); local_irq_save(flags); handler = set_except_vector(EXCCODE_OV, handle_daddi_ov); @@ -236,11 +236,11 @@ static inline void check_daddi(void) local_irq_restore(flags); if (daddi_ov) { - printk("yes.\n"); + pr_cont("yes.\n"); return; } - printk("no.\n"); + pr_cont("no.\n"); panic(bug64hit, !DADDI_WAR ? daddiwar : nowar); } @@ -250,7 +250,7 @@ static inline void check_daddiu(void) { long v, w, tmp; - printk("Checking for the daddiu bug... "); + pr_info("Checking for the daddiu bug... "); /* * The following code leads to a wrong result of daddiu when @@ -288,11 +288,11 @@ static inline void check_daddiu(void) daddiu_bug = v != w; if (!daddiu_bug) { - printk("no.\n"); + pr_cont("no.\n"); return; } - printk("yes, workaround... "); + pr_cont("yes, workaround... "); asm volatile( "addiu %2, $0, %3\n\t" @@ -304,11 +304,11 @@ static inline void check_daddiu(void) : "I" (0xffffffffffffdb9aUL), "I" (0x1234)); if (v == w) { - printk("yes.\n"); + pr_cont("yes.\n"); return; } - printk("no.\n"); + pr_cont("no.\n"); panic(bug64hit, !DADDI_WAR ? daddiwar : nowar); }