diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-11 18:18:28 (GMT) |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-09-11 18:18:28 (GMT) |
| commit | c2172ce2303051764829d4958bd50a11ada0590f (patch) | |
| tree | c465594496072249d2ad8ee4642f7c5dcd57e139 /arch/arm/mm/abort-ev5tj.S | |
| parent | a4a5a7379e4ca03c192b732d61e446994eb67bbc (diff) | |
| parent | 0b61f2c0f37983c98ed4207f3f5e265938371b68 (diff) | |
| download | linux-c2172ce2303051764829d4958bd50a11ada0590f.tar.xz | |
Merge branch 'uaccess' into fixes
Diffstat (limited to 'arch/arm/mm/abort-ev5tj.S')
| -rw-r--r-- | arch/arm/mm/abort-ev5tj.S | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/arm/mm/abort-ev5tj.S b/arch/arm/mm/abort-ev5tj.S index 4006b7a..00ab011 100644 --- a/arch/arm/mm/abort-ev5tj.S +++ b/arch/arm/mm/abort-ev5tj.S @@ -24,7 +24,9 @@ ENTRY(v5tj_early_abort) bne do_DataAbort do_thumb_abort fsr=r1, pc=r4, psr=r5, tmp=r3 ldreq r3, [r4] @ read aborted ARM instruction - do_ldrd_abort tmp=ip, insn=r3 + uaccess_disable ip @ disable userspace access + teq_ldrd tmp=ip, insn=r3 @ insn was LDRD? + beq do_DataAbort @ yes tst r3, #1 << 20 @ L = 0 -> write orreq r1, r1, #1 << 11 @ yes. b do_DataAbort |