diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-09-21 03:48:33 -0400 |
| commit | f70cac8d9c7125f83048f8b3d1c60f5a041a165c (patch) | |
| tree | 0d0efd72c1a41f973a919b16aac1d8210ed1ee30 /arch/arm/mm/abort-macro.S | |
| parent | 4722cd7741c6404f967f7a7b8b666540b6c1663e (diff) | |
| parent | 08aab447c56a5388cf0c768da476ad022f00fef8 (diff) | |
Merge branch 'kprobes-test' of git://git.yxit.co.uk/linux into devel-stable
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 52162d59407a..2cbf68ef0e83 100644 --- a/arch/arm/mm/abort-macro.S +++ b/arch/arm/mm/abort-macro.S | |||
| @@ -17,7 +17,7 @@ | |||
| 17 | cmp \tmp, # 0x5600 @ Is it ldrsb? | 17 | cmp \tmp, # 0x5600 @ Is it ldrsb? |
| 18 | orreq \tmp, \tmp, #1 << 11 @ Set L-bit if yes | 18 | orreq \tmp, \tmp, #1 << 11 @ Set L-bit if yes |
| 19 | tst \tmp, #1 << 11 @ L = 0 -> write | 19 | tst \tmp, #1 << 11 @ L = 0 -> write |
| 20 | orreq \psr, \psr, #1 << 11 @ yes. | 20 | orreq \fsr, \fsr, #1 << 11 @ yes. |
| 21 | b do_DataAbort | 21 | b do_DataAbort |
| 22 | not_thumb: | 22 | not_thumb: |
| 23 | .endm | 23 | .endm |