[PATCH] powerpc/book3s: Fix some ABIv2 issues in machine check code

Anton Blanchard anton at samba.org
Thu Jun 12 09:08:37 EST 2014


Commit 2749a2f26a7c (powerpc/book3s: Fix machine check handling for
unhandled errors) introduced a few ABIv2 issues.

We can maintain ABIv1 and ABIv2 compatibility by branching to the
function rather than the dot symbol.

Fixes: 2749a2f26a7c ("powerpc/book3s: Fix machine check handling for unhandled errors")
Signed-off-by: Anton Blanchard <anton at samba.org>
---

Index: b/arch/powerpc/kernel/exceptions-64s.S
===================================================================
--- a/arch/powerpc/kernel/exceptions-64s.S
+++ b/arch/powerpc/kernel/exceptions-64s.S
@@ -1502,13 +1502,13 @@ machine_check_handle_early:
 unrecover_mce:
 	/* Invoke machine_check_exception to print MCE event and panic. */
 	addi	r3,r1,STACK_FRAME_OVERHEAD
-	bl	.machine_check_exception
+	bl	machine_check_exception
 	/*
 	 * We will not reach here. Even if we did, there is no way out. Call
 	 * unrecoverable_exception and die.
 	 */
 1:	addi	r3,r1,STACK_FRAME_OVERHEAD
-	bl	.unrecoverable_exception
+	bl	unrecoverable_exception
 	b	1b
 /*
  * r13 points to the PACA, r9 contains the saved CR,


More information about the Linuxppc-dev mailing list