summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2014-06-12 09:08:37 +1000
committerBenjamin Herrenschmidt <benh@kernel.crashing.org>2014-06-12 09:41:33 +1000
commitad718622ab6d500c870772b1b8dda46fa2195e6d (patch)
tree7f8e22b96b79fe33e3552e2040ef624cbb89ee96 /arch
parent74845bc2fa9c0e6b218821cd4e1eb7a552d3e503 (diff)
downloadlinux-stable-ad718622ab6d500c870772b1b8dda46fa2195e6d.tar.gz
linux-stable-ad718622ab6d500c870772b1b8dda46fa2195e6d.tar.bz2
linux-stable-ad718622ab6d500c870772b1b8dda46fa2195e6d.zip
powerpc/book3s: Fix some ABIv2 issues in machine check code
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@samba.org> Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/exceptions-64s.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/exceptions-64s.S b/arch/powerpc/kernel/exceptions-64s.S
index 8a0292dbb5fc..a7d36b19221d 100644
--- 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,