diff options
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mm/abort-ev6.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index 94077fbd96b7..6f7e70907e44 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S | |||
| @@ -29,10 +29,10 @@ ENTRY(v6_early_abort) | |||
| 29 | mrc p15, 0, r1, c5, c0, 0 @ get FSR | 29 | mrc p15, 0, r1, c5, c0, 0 @ get FSR |
| 30 | mrc p15, 0, r0, c6, c0, 0 @ get FAR | 30 | mrc p15, 0, r0, c6, c0, 0 @ get FAR |
| 31 | /* | 31 | /* |
| 32 | * Faulty SWP instruction on 1136 doesn't set bit 11 in DFSR. | 32 | * Faulty SWP instruction on 1136 doesn't set bit 11 in DFSR (erratum 326103). |
| 33 | * The test below covers all the write situations, including Java bytecodes | 33 | * The test below covers all the write situations, including Java bytecodes |
| 34 | */ | 34 | */ |
| 35 | bic r1, r1, #1 << 11 | 1 << 10 @ clear bits 11 and 10 of FSR | 35 | bic r1, r1, #1 << 11 @ clear bit 11 of FSR |
| 36 | tst r3, #PSR_J_BIT @ Java? | 36 | tst r3, #PSR_J_BIT @ Java? |
| 37 | movne pc, lr | 37 | movne pc, lr |
| 38 | do_thumb_abort | 38 | do_thumb_abort |