Commit db5ba5ae authored by Michael Ellerman's avatar Michael Ellerman

powerpc/oops: Fix missing pr_cont()s in print_msr_bits() et. al.

Since the KERN_CONT changes these are being horribly split across lines,
for example:

    MSR: 8000000000009033 <
    SF,EE
    ,ME,IR
    ,DR,RI
    ,LE>

So fix it by using pr_cont() where appropriate.
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 9a1f490f
...@@ -1282,7 +1282,7 @@ static void print_bits(unsigned long val, struct regbit *bits, const char *sep) ...@@ -1282,7 +1282,7 @@ static void print_bits(unsigned long val, struct regbit *bits, const char *sep)
for (; bits->bit; ++bits) for (; bits->bit; ++bits)
if (val & bits->bit) { if (val & bits->bit) {
printk("%s%s", s, bits->name); pr_cont("%s%s", s, bits->name);
s = sep; s = sep;
} }
} }
...@@ -1305,9 +1305,9 @@ static void print_tm_bits(unsigned long val) ...@@ -1305,9 +1305,9 @@ static void print_tm_bits(unsigned long val)
* T: Transactional (bit 34) * T: Transactional (bit 34)
*/ */
if (val & (MSR_TM | MSR_TS_S | MSR_TS_T)) { if (val & (MSR_TM | MSR_TS_S | MSR_TS_T)) {
printk(",TM["); pr_cont(",TM[");
print_bits(val, msr_tm_bits, ""); print_bits(val, msr_tm_bits, "");
printk("]"); pr_cont("]");
} }
} }
#else #else
...@@ -1316,10 +1316,10 @@ static void print_tm_bits(unsigned long val) {} ...@@ -1316,10 +1316,10 @@ static void print_tm_bits(unsigned long val) {}
static void print_msr_bits(unsigned long val) static void print_msr_bits(unsigned long val)
{ {
printk("<"); pr_cont("<");
print_bits(val, msr_bits, ","); print_bits(val, msr_bits, ",");
print_tm_bits(val); print_tm_bits(val);
printk(">"); pr_cont(">");
} }
#ifdef CONFIG_PPC64 #ifdef CONFIG_PPC64
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment