From a2e9657e72e480ee57c85ac043e75474898965b5 Mon Sep 17 00:00:00 2001
From: Will Deacon <will.deacon@arm.com>
Date: Fri, 31 Aug 2012 00:57:03 +0100
Subject: [PATCH] --- yaml --- r: 339551 b: refs/heads/master c:
 0cbbbad63179652272cc5e18a68d69bfc8dd25ce h: refs/heads/master i:   339549:
 ff4ceb8e482c77cc6b4b24f86a1d8f9d2f2f3e4f   339547:
 5e63b51ec40bd76c80e9f962171ec38c323e50e3   339543:
 5f548c9c561d2b1afe3fd73a3daba93e223b5d3e   339535:
 2ac2e610f03df84e701702b465452953aecd1fa0   339519:
 63dcdaf3bde64094422ae4a714d0f24250e9718f v: v3

---
 [refs]                             | 2 +-
 trunk/arch/arm/mm/proc-v7-2level.S | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 9f32323b410f..951b04b1c617 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 864aa04cd02979c2c755cb28b5f4fe56039171c0
+refs/heads/master: 0cbbbad63179652272cc5e18a68d69bfc8dd25ce
diff --git a/trunk/arch/arm/mm/proc-v7-2level.S b/trunk/arch/arm/mm/proc-v7-2level.S
index fd045e706390..e37600b91b25 100644
--- a/trunk/arch/arm/mm/proc-v7-2level.S
+++ b/trunk/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