diff options
| author | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:40:40 -0700 |
|---|---|---|
| committer | Barry Song <Barry.Song@csr.com> | 2011-10-24 02:45:43 -0700 |
| commit | 1e11bec9b09a28f81dd3173fec6b1c6c56b5e299 (patch) | |
| tree | cddb92f82bda3a5f362bb6d9f775d25dd1205e6b /arch/arm/mm/abort-macro.S | |
| parent | 2558bd99cb1426a05ac8f1c78dc9c75a83ceb4bb (diff) | |
| parent | 91c2ebb90b1890abc648ba9dec5608cbc97e1cb9 (diff) | |
Merge branch 'l2x0' of rmk tree into prima2-l2x0
Diffstat (limited to 'arch/arm/mm/abort-macro.S')
| -rw-r--r-- | arch/arm/mm/abort-macro.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/abort-macro.S b/arch/arm/mm/abort-macro.S index 52162d59407..2cbf68ef0e8 100644 --- a/arch/arm/mm/abort-macro.S +++ b/arch/arm/mm/abort-macro.S @@ -17,7 +17,7 @@ cmp \tmp, # 0x5600 @ Is it ldrsb? orreq \tmp, \tmp, #1 << 11 @ Set L-bit if yes tst \tmp, #1 << 11 @ L = 0 -> write - orreq \psr, \psr, #1 << 11 @ yes. + orreq \fsr, \fsr, #1 << 11 @ yes. b do_DataAbort not_thumb: .endm |