aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2012-08-30 19:57:03 -0400
committerWill Deacon <will.deacon@arm.com>2012-11-09 09:13:19 -0500
commit0cbbbad63179652272cc5e18a68d69bfc8dd25ce (patch)
treecc4c814c17c476e270c9285cfe7b010601c346f7 /arch/arm/mm
parent864aa04cd02979c2c755cb28b5f4fe56039171c0 (diff)
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 fd045e706390..e37600b91b25 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)
161 * TFR EV X F I D LR S 161 * TFR EV X F I D LR S
162 * .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM 162 * .EEE ..EE PUI. .T.T 4RVI ZWRS BLDP WCAM
163 * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx < forced 163 * rxxx rrxx xxx0 0101 xxxx xxxx x111 xxxx < forced
164 * 1 0 110 0011 1100 .111 1101 < we want 164 * 01 0 110 0011 1100 .111 1101 < we want
165 */ 165 */
166 .align 2 166 .align 2
167 .type v7_crval, #object 167 .type v7_crval, #object
168v7_crval: 168v7_crval:
169 crval clear=0x0120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c 169 crval clear=0x2120c302, mmuset=0x10c03c7d, ucset=0x00c01c7c
170 170
171 .previous 171 .previous