Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ffd04de authored by Andrew Donnellan's avatar Andrew Donnellan Committed by Michael Ellerman
Browse files

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: default avatarAndrew Donnellan <andrew.donnellan@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent 7dae865f

arch/powerpc/kernel/process.c

+5 −5
Original line number Diff line number Diff line
@@ -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 {