diff options
| author | Greg Bellows <greg.bellows@linaro.org> | 2015-04-08 13:15:20 -0500 |
|---|---|---|
| committer | Greg Bellows <greg.bellows@linaro.org> | 2015-04-08 13:15:20 -0500 |
| commit | 3c99b20de1c386923894c48f606827d909181cf8 (patch) | |
| tree | 807083149825080d9d91214fdbefc8e7f648eb7a | |
| parent | a686bc93b82caf57e888d6cd8bc9b0c6adacd590 (diff) | |
Fix EL1 exception handler LR arg
Signed-off-by: Greg Bellows <greg.bellows@linaro.org>
| -rw-r--r-- | arm/el1_common/el1_exception.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arm/el1_common/el1_exception.S b/arm/el1_common/el1_exception.S index 9a5e720..e05523e 100644 --- a/arm/el1_common/el1_exception.S +++ b/arm/el1_common/el1_exception.S @@ -30,7 +30,7 @@ el1_iabort_vect: mov r0, #EC_IABORT /* Treat ARMv7 iaborts as at same level */ mrc p15, 0, r1, c5, c0, 1 /* ISS = IFSR on ARMv7 */ mrc p15, 0, r2, c6, c0, 2 /* IFAR */ - ldr r3, [sp], #4 + ldr r3, [sp, #16] /* Jump back over the saved args for LR */ bl el1_handle_exception pop {r0-r3} rfefd sp! @@ -41,7 +41,7 @@ el1_dabort_vect: mov r0, #EC_DABORT /* Treat ARMv7 iaborts as at same level */ mrc p15, 0, r1, c5, c0, 0 /* ISS = DFSR on ARMv7 */ mrc p15, 0, r2, c6, c0, 0 /* DFAR */ - ldr r3, [sp], #4 + ldr r3, [sp, #16] /* Jump back over the saved args for LR */ bl el1_handle_exception pop {r0-r3} rfefd sp! |