Initial Contribution

msm-2.6.38: tag AU_LINUX_ANDROID_GINGERBREAD.02.03.04.00.142

Signed-off-by: Bryan Huntsman <bryanh@codeaurora.org>
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index 56b2715..aaca029 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -453,6 +453,10 @@
 
 		up_read(&mm->mmap_sem);
 		flush_cache_user_range(start, end);
+
+#ifdef CONFIG_ARCH_MSM7X27
+		mb();
+#endif
 		return;
 	}
 	up_read(&mm->mmap_sem);