diff options
author | Andrew Donnellan <andrew.donnellan@au1.ibm.com> | 2016-11-04 02:20:40 -0400 |
---|---|---|
committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-11-12 04:12:51 -0500 |
commit | 2ffd04dee0dacff36c03a02434965a96da032bcd (patch) | |
tree | 91d2daa8ea0304b9cb4a131de65e5459eb2cf7d0 | |
parent | 7dae865f5878fc0c2edfb3b9165712ef33ce03df (diff) |
powerpc/oops: Fix missing pr_cont()s in instruction dump
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>
-rw-r--r-- | arch/powerpc/kernel/process.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 6fe8fa481f8a..49a680d5ae37 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c | |||
@@ -1215,7 +1215,7 @@ static void show_instructions(struct pt_regs *regs) | |||
1215 | int instr; | 1215 | int instr; |
1216 | 1216 | ||
1217 | if (!(i % 8)) | 1217 | if (!(i % 8)) |
1218 | printk("\n"); | 1218 | pr_cont("\n"); |
1219 | 1219 | ||
1220 | #if !defined(CONFIG_BOOKE) | 1220 | #if !defined(CONFIG_BOOKE) |
1221 | /* If executing with the IMMU off, adjust pc rather | 1221 | /* If executing with the IMMU off, adjust pc rather |
@@ -1227,18 +1227,18 @@ static void show_instructions(struct pt_regs *regs) | |||
1227 | 1227 | ||
1228 | if (!__kernel_text_address(pc) || | 1228 | if (!__kernel_text_address(pc) || |
1229 | probe_kernel_address((unsigned int __user *)pc, instr)) { | 1229 | probe_kernel_address((unsigned int __user *)pc, instr)) { |
1230 | printk(KERN_CONT "XXXXXXXX "); | 1230 | pr_cont("XXXXXXXX "); |
1231 | } else { | 1231 | } else { |
1232 | if (regs->nip == pc) | 1232 | if (regs->nip == pc) |
1233 | printk(KERN_CONT "<%08x> ", instr); | 1233 | pr_cont("<%08x> ", instr); |
1234 | else | 1234 | else |
1235 | printk(KERN_CONT "%08x ", instr); | 1235 | pr_cont("%08x ", instr); |
1236 | } | 1236 | } |
1237 | 1237 | ||
1238 | pc += sizeof(int); | 1238 | pc += sizeof(int); |
1239 | } | 1239 | } |
1240 | 1240 | ||
1241 | printk("\n"); | 1241 | pr_cont("\n"); |
1242 | } | 1242 | } |
1243 | 1243 | ||
1244 | struct regbit { | 1244 | struct regbit { |