summaryrefslogtreecommitdiff
path: root/arch/arm/nwfpe
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2015-09-07 02:29:15 +0300
committerRussell King <rmk+kernel@arm.linux.org.uk>2015-09-10 01:26:11 +0300
commit39dc53deff30d9b239ac36cfeb0ef2022d03a449 (patch)
treec4292d8344604d718a28c034ec6e62febe1d0907 /arch/arm/nwfpe
parenta5e090acbf545c0a3b04080f8a488b17ec41fe02 (diff)
downloadlinux-39dc53deff30d9b239ac36cfeb0ef2022d03a449.tar.xz
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/arm/nwfpe')
-rw-r--r--arch/arm/nwfpe/entry.S3
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:
reteq r4 @ no, return failure
next:
+ uaccess_enable r3
.Lx1: ldrt r6, [r5], #4 @ get the next instruction and
@ increment PC
-
+ uaccess_disable r3
and r2, r6, #0x0F000000 @ test for FP insns
teq r2, #0x0C000000
teqne r2, #0x0D000000