diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-06 19:29:15 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-09 18:26:11 -0400 |
commit | 39dc53deff30d9b239ac36cfeb0ef2022d03a449 (patch) | |
tree | c4292d8344604d718a28c034ec6e62febe1d0907 /arch | |
parent | a5e090acbf545c0a3b04080f8a488b17ec41fe02 (diff) |
ARM: swpan: fix nwfpe for uaccess changes
NWFPE needs to access userspace to check whether the next instruction
is another FP instruction. Allow userspace access for this read.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/nwfpe/entry.S | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/arm/nwfpe/entry.S b/arch/arm/nwfpe/entry.S index 71df43547659..39c20afad7ed 100644 --- a/arch/arm/nwfpe/entry.S +++ b/arch/arm/nwfpe/entry.S | |||
@@ -95,9 +95,10 @@ emulate: | |||
95 | reteq r4 @ no, return failure | 95 | reteq r4 @ no, return failure |
96 | 96 | ||
97 | next: | 97 | next: |
98 | uaccess_enable r3 | ||
98 | .Lx1: ldrt r6, [r5], #4 @ get the next instruction and | 99 | .Lx1: ldrt r6, [r5], #4 @ get the next instruction and |
99 | @ increment PC | 100 | @ increment PC |
100 | 101 | uaccess_disable r3 | |
101 | and r2, r6, #0x0F000000 @ test for FP insns | 102 | and r2, r6, #0x0F000000 @ test for FP insns |
102 | teq r2, #0x0C000000 | 103 | teq r2, #0x0C000000 |
103 | teqne r2, #0x0D000000 | 104 | teqne r2, #0x0D000000 |