diff options
Diffstat (limited to 'arch/arm/mm/abort-ev5t.S')
| -rw-r--r-- | arch/arm/mm/abort-ev5t.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mm/abort-ev5t.S b/arch/arm/mm/abort-ev5t.S index 800e8d42d39e..97eee7c48019 100644 --- a/arch/arm/mm/abort-ev5t.S +++ b/arch/arm/mm/abort-ev5t.S | |||
| @@ -4,8 +4,8 @@ | |||
| 4 | /* | 4 | /* |
| 5 | * Function: v5t_early_abort | 5 | * Function: v5t_early_abort |
| 6 | * | 6 | * |
| 7 | * Params : r2 = address of aborted instruction | 7 | * Params : r4 = aborted context pc |
| 8 | * : r3 = saved SPSR | 8 | * : r5 = aborted context psr |
| 9 | * | 9 | * |
| 10 | * Returns : r0 = address of abort | 10 | * Returns : r0 = address of abort |
| 11 | * : r1 = FSR, bit 11 = write | 11 | * : r1 = FSR, bit 11 = write |
| @@ -22,8 +22,8 @@ | |||
| 22 | ENTRY(v5t_early_abort) | 22 | ENTRY(v5t_early_abort) |
| 23 | mrc p15, 0, r1, c5, c0, 0 @ get FSR | 23 | mrc p15, 0, r1, c5, c0, 0 @ get FSR |
| 24 | mrc p15, 0, r0, c6, c0, 0 @ get FAR | 24 | mrc p15, 0, r0, c6, c0, 0 @ get FAR |
| 25 | do_thumb_abort fsr=r1, pc=r2, psr=r3, tmp=r3 | 25 | do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3 |
| 26 | ldreq r3, [r2] @ read aborted ARM instruction | 26 | ldreq r3, [r4] @ read aborted ARM instruction |
| 27 | bic r1, r1, #1 << 11 @ clear bits 11 of FSR | 27 | bic r1, r1, #1 << 11 @ clear bits 11 of FSR |
| 28 | do_ldrd_abort tmp=r2, insn=r3 | 28 | do_ldrd_abort tmp=r2, insn=r3 |
| 29 | tst r3, #1 << 20 @ check write | 29 | tst r3, #1 << 20 @ check write |