diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-11 02:28:46 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-09-11 02:28:46 +0200 |
| commit | d0a77454c70d0449a5f87087deb8f0cb15145e90 (patch) | |
| tree | a6efb34357756faede3fd63f5a72e72977c68321 /arch/arm/mm/abort-macro.S | |
| parent | backlight: Declare backlight_types[] const (diff) | |
| parent | ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort (diff) | |
| download | linux-d0a77454c70d0449a5f87087deb8f0cb15145e90.tar.xz linux-d0a77454c70d0449a5f87087deb8f0cb15145e90.zip | |
Merge branch 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm
* 'fixes' of http://ftp.arm.linux.org.uk/pub/linux/arm/kernel/git-cur/linux-2.6-arm:
ARM: 7088/1: entry: fix wrong parameter name used in do_thumb_abort
ARM: 7080/1: l2x0: make sure I&D are not locked down on init
ARM: 7081/1: mach-integrator: fix the clocksource
NET: am79c961: fix race in link status code
ARM: 7067/1: mm: keep significant bits in pfn_valid
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 @@ 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 |