powerpc/traps: merge unrecoverable_exception() and nonrecoverable_exception()

chleroy · mpe · commit 51423a9c9b09 · 2018-10-03T15:40:01.000+10:00
PPC32 uses nonrecoverable_exception() while PPC64 uses
unrecoverable_exception().

Both functions are doing almost the same thing.

This patch removes nonrecoverable_exception()

Signed-off-by: Christophe Leroy &lt;christophe.leroy@c-s.fr&gt;
Signed-off-by: Michael Ellerman &lt;mpe@ellerman.id.au&gt;
diff --git a/arch/powerpc/include/asm/asm-prototypes.h b/arch/powerpc/include/asm/asm-prototypes.h
@@ -63,7 +63,6 @@ void program_check_exception(struct pt_regs *regs);
 void alignment_exception(struct pt_regs *regs);
 void slb_miss_bad_addr(struct pt_regs *regs);
 void StackOverflow(struct pt_regs *regs);
-void nonrecoverable_exception(struct pt_regs *regs);
 void kernel_fp_unavailable_exception(struct pt_regs *regs);
 void altivec_unavailable_exception(struct pt_regs *regs);
 void vsx_unavailable_exception(struct pt_regs *regs);
diff --git a/arch/powerpc/kernel/entry_32.S b/arch/powerpc/kernel/entry_32.S
@@ -794,7 +794,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
 	lis	r10,MSR_KERNEL@h
 	ori	r10,r10,MSR_KERNEL@l
 	bl	transfer_to_handler_full
-	.long	nonrecoverable_exception
+	.long	unrecoverable_exception
 	.long	ret_from_except
 #endif
 
@@ -1297,7 +1297,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_601)
 	rlwinm	r3,r3,0,0,30
 	stw	r3,_TRAP(r1)
 4:	addi	r3,r1,STACK_FRAME_OVERHEAD
-	bl	nonrecoverable_exception
+	bl	unrecoverable_exception
 	/* shouldn't return */
 	b	4b
 
diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c
@@ -1547,14 +1547,6 @@ void StackOverflow(struct pt_regs *regs)
 	panic("kernel stack overflow");
 }
 
-void nonrecoverable_exception(struct pt_regs *regs)
-{
-	printk(KERN_ERR "Non-recoverable exception at PC=%lx MSR=%lx\n",
-	       regs->nip, regs->msr);
-	debugger(regs);
-	die("nonrecoverable exception", regs, SIGKILL);
-}
-
 void kernel_fp_unavailable_exception(struct pt_regs *regs)
 {
 	enum ctx_state prev_state = exception_enter();
@@ -2090,8 +2082,8 @@ void SPEFloatingPointRoundException(struct pt_regs *regs)
  */
 void unrecoverable_exception(struct pt_regs *regs)
 {
-	printk(KERN_EMERG "Unrecoverable exception %lx at %lx\n",
-	       regs->trap, regs->nip);
+	pr_emerg("Unrecoverable exception %lx at %lx (msr=%lx)\n",
+		 regs->trap, regs->nip, regs->msr);
 	die("Unrecoverable exception", regs, SIGABRT);
 }
 NOKPROBE_SYMBOL(unrecoverable_exception);

Original file line number	Diff line number	Diff line change
`@@ -1547,14 +1547,6 @@ void StackOverflow(struct pt_regs *regs)`
`1547`	`1547`	`panic("kernel stack overflow");`
`1548`	`1548`	`}`
`1549`	`1549`
`1550`		`-void nonrecoverable_exception(struct pt_regs *regs)`
`1551`		`-{`
`1552`		`- printk(KERN_ERR "Non-recoverable exception at PC=%lx MSR=%lx\n",`
`1553`		`- regs->nip, regs->msr);`
`1554`		`- debugger(regs);`
`1555`		`- die("nonrecoverable exception", regs, SIGKILL);`
`1556`		`-}`
`1557`		`-`
`1558`	`1550`	`void kernel_fp_unavailable_exception(struct pt_regs *regs)`
`1559`	`1551`	`{`
`1560`	`1552`	`enum ctx_state prev_state = exception_enter();`
`@@ -2090,8 +2082,8 @@ void SPEFloatingPointRoundException(struct pt_regs *regs)`
`2090`	`2082`	`*/`
`2091`	`2083`	`void unrecoverable_exception(struct pt_regs *regs)`
`2092`	`2084`	`{`
`2093`		`- printk(KERN_EMERG "Unrecoverable exception %lx at %lx\n",`
`2094`		`- regs->trap, regs->nip);`
	`2085`	`+ pr_emerg("Unrecoverable exception %lx at %lx (msr=%lx)\n",`
	`2086`	`+ regs->trap, regs->nip, regs->msr);`
`2095`	`2087`	`die("Unrecoverable exception", regs, SIGABRT);`
`2096`	`2088`	`}`
`2097`	`2089`	`NOKPROBE_SYMBOL(unrecoverable_exception);`