projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
74845bc
)
powerpc/book3s: Fix some ABIv2 issues in machine check code
author
Anton Blanchard
<
[email protected]
>
Wed, 11 Jun 2014 23:08:37 +0000
(09:08 +1000)
committer
Benjamin Herrenschmidt
<
[email protected]
>
Wed, 11 Jun 2014 23:41:33 +0000
(09:41 +1000)
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 <
[email protected]
>
Signed-off-by: Benjamin Herrenschmidt <
[email protected]
>
arch/powerpc/kernel/exceptions-64s.S
patch
|
blob
|
history
diff --git
a/arch/powerpc/kernel/exceptions-64s.S
b/arch/powerpc/kernel/exceptions-64s.S
index 8a0292dbb5fcf27bc14ea3e476e195a4b81de3c4..a7d36b19221d4710eb3e35db66b43fd5055e4c92 100644
(file)
--- 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,