From 05b373513efe36bb00ab76267abd6a9b5e811e10 Mon Sep 17 00:00:00 2001
From: Catalin Marinas <catalin.marinas@arm.com>
Date: Mon, 21 Jun 2010 15:09:36 +0100
Subject: [PATCH] --- yaml --- r: 200791 b: refs/heads/master c:
 ca57926d53580f7c950496cb7ef6d7930610e1dd h: refs/heads/master i:   200789:
 847aec4fc5f1388a5526d1042877ab1885a5bebd   200787:
 fca79448899b287898e5f04e23519e020b0972c3   200783:
 41dbc1c72ba1a751cb47aeb8b3f51469a7cd534c v: v3

---
 [refs]                       | 2 +-
 trunk/arch/arm/mm/cache-v6.S | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index fc446288d790..10ff43abc309 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5e9d38b226686c89fd78413456535d5b66e8b1f
+refs/heads/master: ca57926d53580f7c950496cb7ef6d7930610e1dd
diff --git a/trunk/arch/arm/mm/cache-v6.S b/trunk/arch/arm/mm/cache-v6.S
index e46ecd847138..332b48c6d4ff 100644
--- a/trunk/arch/arm/mm/cache-v6.S
+++ b/trunk/arch/arm/mm/cache-v6.S
@@ -212,7 +212,8 @@ v6_dma_inv_range:
 #endif
 1:
 #ifdef CONFIG_SMP
-	str	r0, [r0]			@ write for ownership
+	ldr	r2, [r0]			@ read for ownership
+	str	r2, [r0]			@ write for ownership
 #endif
 #ifdef HARVARD_CACHE
 	mcr	p15, 0, r0, c7, c6, 1		@ invalidate D line