Skip to content

Commit

Permalink
powerpc/oops: Fix missing pr_cont()s in instruction dump
Browse files Browse the repository at this point in the history
Since the KERN_CONT changes, the current code in show_instructions()
prints out a whole bunch of unnecessary newlines. Change occurrences of
printk("\n") to pr_cont("\n"). While we're here, change all the other
cases of printk(KERN_CONT ...) to pr_cont() as well.

Signed-off-by: Andrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
  • Loading branch information
Andrew Donnellan authored and Michael Ellerman committed Nov 12, 2016
1 parent 7dae865 commit 2ffd04d
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions arch/powerpc/kernel/process.c
Original file line number Diff line number Diff line change
Expand Up @@ -1215,7 +1215,7 @@ static void show_instructions(struct pt_regs *regs)
int instr;

if (!(i % 8))
printk("\n");
pr_cont("\n");

#if !defined(CONFIG_BOOKE)
/* If executing with the IMMU off, adjust pc rather
Expand All @@ -1227,18 +1227,18 @@ static void show_instructions(struct pt_regs *regs)

if (!__kernel_text_address(pc) ||
probe_kernel_address((unsigned int __user *)pc, instr)) {
printk(KERN_CONT "XXXXXXXX ");
pr_cont("XXXXXXXX ");
} else {
if (regs->nip == pc)
printk(KERN_CONT "<%08x> ", instr);
pr_cont("<%08x> ", instr);
else
printk(KERN_CONT "%08x ", instr);
pr_cont("%08x ", instr);
}

pc += sizeof(int);
}

printk("\n");
pr_cont("\n");
}

struct regbit {
Expand Down

0 comments on commit 2ffd04d

Please sign in to comment.