diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-26 09:35:07 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-02 05:56:11 -0400 |
| commit | 3e287bec6fde088bff05ee7f998f53e8ac75b922 (patch) | |
| tree | 4ad814de273327ae1e6ddc354ab0ab6bb9653246 /arch/arm/kernel/entry-armv.S | |
| parent | 8dfe7ac96fedd4f5219879f63a8a546a33609daf (diff) | |
ARM: entry: data abort: arrange for CPU abort helpers to take pc/psr in r4/r5
Re-jig the CPU abort helpers to take the PC/PSR in r4/r5 rather
than r2/r3.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index af2fba7a4cae..85298c093256 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S | |||
| @@ -56,14 +56,12 @@ | |||
| 56 | .endm | 56 | .endm |
| 57 | 57 | ||
| 58 | .macro dabt_helper | 58 | .macro dabt_helper |
| 59 | mov r2, r4 | ||
| 60 | mov r3, r5 | ||
| 61 | 59 | ||
| 62 | @ | 60 | @ |
| 63 | @ Call the processor-specific abort handler: | 61 | @ Call the processor-specific abort handler: |
| 64 | @ | 62 | @ |
| 65 | @ r2 - aborted context pc | 63 | @ r4 - aborted context pc |
| 66 | @ r3 - aborted context cpsr | 64 | @ r5 - aborted context psr |
| 67 | @ | 65 | @ |
| 68 | @ The abort handler must return the aborted address in r0, and | 66 | @ The abort handler must return the aborted address in r0, and |
| 69 | @ the fault status register in r1. r9 must be preserved. | 67 | @ the fault status register in r1. r9 must be preserved. |