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.donnel...@au1.ibm.com>

---

Based off mpe's earlier pr_cont() fixes series
---
 arch/powerpc/kernel/process.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index ea6fe2e..749fb41 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)
                int instr;
 
                if (!(i % 8))
-                       printk("\n");
+                       pr_cont("\n");
 
 #if !defined(CONFIG_BOOKE)
                /* If executing with the IMMU off, adjust pc rather
@@ -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 {
-- 
Andrew Donnellan              OzLabs, ADL Canberra
andrew.donnel...@au1.ibm.com  IBM Australia Limited

Reply via email to