Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 36ad7b0

Browse files
bsingharora0day robot
authored and
0day robot
committedNov 1, 2016
Fixup OOPS output
With recent update to printk, we get console output like below P O 4.9.0-rc2-next-20161028-00003-g23bf57759-dirty torvalds#125 c0000000ef5f4000 0000000000010000 P O (4.9.0-rc2-next-20161028-00003-g23bf57759-dirty) 9000000010009033 < SF ,HV ,EE ,ME ,IR ,DR ,RI ,LE > and more output that is not easy to parse Fix the OOPS output so that it is easier on the eyes again Signed-off-by: Balbir Singh <bsingharora@gmail.com>
1 parent 08bf75b commit 36ad7b0

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed
 

‎arch/powerpc/kernel/process.c

+12-12
Original file line numberDiff line numberDiff line change
@@ -1282,7 +1282,7 @@ static void print_bits(unsigned long val, struct regbit *bits, const char *sep)
12821282

12831283
for (; bits->bit; ++bits)
12841284
if (val & bits->bit) {
1285-
printk("%s%s", s, bits->name);
1285+
pr_cont("%s%s", s, bits->name);
12861286
s = sep;
12871287
}
12881288
}
@@ -1305,9 +1305,9 @@ static void print_tm_bits(unsigned long val)
13051305
* T: Transactional (bit 34)
13061306
*/
13071307
if (val & (MSR_TM | MSR_TS_S | MSR_TS_T)) {
1308-
printk(",TM[");
1308+
pr_cont(",TM[");
13091309
print_bits(val, msr_tm_bits, "");
1310-
printk("]");
1310+
pr_cont("]");
13111311
}
13121312
}
13131313
#else
@@ -1316,10 +1316,10 @@ static void print_tm_bits(unsigned long val) {}
13161316

13171317
static void print_msr_bits(unsigned long val)
13181318
{
1319-
printk("<");
1319+
pr_cont("<");
13201320
print_bits(val, msr_bits, ",");
13211321
print_tm_bits(val);
1322-
printk(">");
1322+
pr_cont(">");
13231323
}
13241324

13251325
#ifdef CONFIG_PPC64
@@ -1347,15 +1347,15 @@ void show_regs(struct pt_regs * regs)
13471347
printk(" CR: %08lx XER: %08lx\n", regs->ccr, regs->xer);
13481348
trap = TRAP(regs);
13491349
if ((regs->trap != 0xc00) && cpu_has_feature(CPU_FTR_CFAR))
1350-
printk("CFAR: "REG" ", regs->orig_gpr3);
1350+
pr_cont("CFAR: "REG" ", regs->orig_gpr3);
13511351
if (trap == 0x200 || trap == 0x300 || trap == 0x600)
13521352
#if defined(CONFIG_4xx) || defined(CONFIG_BOOKE)
1353-
printk("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
1353+
pr_cont("DEAR: "REG" ESR: "REG" ", regs->dar, regs->dsisr);
13541354
#else
1355-
printk("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
1355+
pr_cont("DAR: "REG" DSISR: %08lx ", regs->dar, regs->dsisr);
13561356
#endif
13571357
#ifdef CONFIG_PPC64
1358-
printk("SOFTE: %ld ", regs->softe);
1358+
pr_cont("SOFTE: %ld ", regs->softe);
13591359
#endif
13601360
#ifdef CONFIG_PPC_TRANSACTIONAL_MEM
13611361
if (MSR_TM_ACTIVE(regs->msr))
@@ -1364,8 +1364,8 @@ void show_regs(struct pt_regs * regs)
13641364

13651365
for (i = 0; i < 32; i++) {
13661366
if ((i % REGS_PER_LINE) == 0)
1367-
printk("\nGPR%02d: ", i);
1368-
printk(REG " ", regs->gpr[i]);
1367+
pr_cont("\nGPR%02d: ", i);
1368+
pr_cont(REG " ", regs->gpr[i]);
13691369
if (i == LAST_VOLATILE && !FULL_REGS(regs))
13701370
break;
13711371
}
@@ -1906,7 +1906,7 @@ void show_stack(struct task_struct *tsk, unsigned long *stack)
19061906
}
19071907
#endif
19081908
if (firstframe)
1909-
printk(" (unreliable)");
1909+
pr_cont(" (unreliable)");
19101910
printk("\n");
19111911
}
19121912
firstframe = 0;

0 commit comments

Comments
 (0)
Please sign in to comment.