From 3096ca9235b8ca7d4cf0c04e63bd77e1fedf1c2d Mon Sep 17 00:00:00 2001
From: Russell King <rmk+kernel@arm.linux.org.uk>
Date: Sat, 27 Aug 2011 00:37:38 +0100
Subject: [PATCH] --- yaml --- r: 263593 b: refs/heads/master c:
 f35235a315a167e38e8e5bc9e476dcd7c932612c h: refs/heads/master i:   263591:
 d28f9719925602999168a1f3c9f975222ba36d48 v: v3

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

diff --git a/[refs] b/[refs]
index 6fdacec4d37e..6b438ca90ff4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1c0270cd3a7a66148c3f72cab8fffc650d196d1d
+refs/heads/master: f35235a315a167e38e8e5bc9e476dcd7c932612c
diff --git a/trunk/arch/arm/mm/proc-v7.S b/trunk/arch/arm/mm/proc-v7.S
index dec72ee9f7af..a773f4e2869c 100644
--- a/trunk/arch/arm/mm/proc-v7.S
+++ b/trunk/arch/arm/mm/proc-v7.S
@@ -255,6 +255,7 @@ ENTRY(cpu_v7_do_resume)
 	mcr	p15, 0, r4, c10, c2, 0	@ write PRRR
 	mcr	p15, 0, r5, c10, c2, 1	@ write NMRR
 	isb
+	dsb
 	mov	r0, r9			@ control register
 	mov	r2, r7, lsr #14		@ get TTB0 base
 	mov	r2, r2, lsl #14