summaryrefslogtreecommitdiff
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-08-31 00:57:03 +0100
committerWill Deacon <will.deacon@arm.com>2012-11-09 14:13:19 +0000
commit0cbbbad63179652272cc5e18a68d69bfc8dd25ce (patch)
treecc4c814c17c476e270c9285cfe7b010601c346f7 /arch/arm/mm
parent864aa04cd02979c2c755cb28b5f4fe56039171c0 (diff)
downloadlinux-3.10-0cbbbad63179652272cc5e18a68d69bfc8dd25ce.tar.gz
linux-3.10-0cbbbad63179652272cc5e18a68d69bfc8dd25ce.tar.bz2
linux-3.10-0cbbbad63179652272cc5e18a68d69bfc8dd25ce.zip
ARM: mm: don't use the access flag permissions mechanism for classic MMU
The simplified access permissions model is not used for the classic MMU translation regime, so ensure that it is turned off in the sctlr prior to turning on address translation for ARMv7. Acked-by: Catalin Marinas <catalin.marinas@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm/mm')
-rw-r--r--arch/arm/mm/proc-v7-2level.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S
index fd045e70639..e37600b91b2 100644
--- a/arch/arm/mm/proc-v7-2level.S
+++ b/arch/arm/mm/proc-v7-2level.S
@@ -161,11 +161,11 @@ ENDPROC(cpu_v7_set_pte_ext)
* TFR EV X F I D LR S
* .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM
* rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx < forced
- * 1 0 110 0011 1100 .111 1101 < we want
+ * 01 0 110 0011 1100 .111 1101 < we want
*/
.align 2
.type v7_crval, #object
v7_crval:
- crval clear=0x0120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c
+ crval clear=0x2120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c
.previous