Skip to content

Commit

Permalink
MIPS: Fix printk continuations in cpu-bugs64.c
Browse files Browse the repository at this point in the history
64-bit pre-r6 kernels output the following broken printk continuation
lines during boot:

Checking for the multiply/shift bug...
no.
Checking for the daddiu bug...
no.
Checking for the daddi bug...
no.

Fix the printk continuations in cpu-bugs64.c to use pr_cont to restore
the correct output:

Checking for the multiply/shift bug... no.
Checking for the daddiu bug... no.
Checking for the daddi bug... no.

Signed-off-by: James Hogan <james.hogan@imgtec.com>
Cc: linux-mips@linux-mips.org
Patchwork: https://patchwork.linux-mips.org/patch/14916/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
  • Loading branch information
James Hogan authored and Ralf Baechle committed Jan 24, 2017
1 parent 209ec69 commit 35e7f78
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions arch/mips/kernel/cpu-bugs64.c
Original file line number Diff line number Diff line change
Expand Up @@ -148,23 +148,23 @@ 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++)
if (v2[i] != w[i])
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);
}

Expand Down Expand Up @@ -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);
Expand All @@ -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);
}

Expand Down Expand Up @@ -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"
Expand All @@ -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);
}

Expand Down

0 comments on commit 35e7f78

Please sign in to comment.