From 17b3bd02d1b6ba64d96f485de1ea7ecfedc42629 Mon Sep 17 00:00:00 2001
From: Dave Martin <dave.martin@linaro.org>
Date: Fri, 14 Jan 2011 00:43:01 +0100
Subject: [PATCH] --- yaml --- r: 231293 b: refs/heads/master c:
 874d5d3ccc04c0659b76b05ee0c761f568062cb1 h: refs/heads/master i:   231291:
 201bf60a3651dbe4047c13fef3c20ca1b985a854 v: v3

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

diff --git a/[refs] b/[refs]
index b80c58754c34..ee93cbad3a44 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0adfca6ff2131c7c67dffe094611097bbc9f5005
+refs/heads/master: 874d5d3ccc04c0659b76b05ee0c761f568062cb1
diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/arch/arm/mm/proc-v7.S
index b49fab21517c..0c1172b56b4e 100644
--- a/trunk/arch/arm/mm/proc-v7.S
+++ b/trunk/arch/arm/mm/proc-v7.S
@@ -159,7 +159,9 @@ ENTRY(cpu_v7_set_pte_ext)
 	tstne	r1, #L_PTE_PRESENT
 	moveq	r3, #0
 
-	str	r3, [r0, #2048]!
+ ARM(	str	r3, [r0, #2048]! )
+ THUMB(	add	r0, r0, #2048 )
+ THUMB(	str	r3, [r0] )
 	mcr	p15, 0, r0, c7, c10, 1		@ flush_pte
 #endif
 	mov	pc, lr