aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mm/cache-v7.S
diff options
context:
space:
mode:
authorcodeworkx <codeworkx@cyanogenmod.org>2013-03-16 15:25:02 +0000
committercodeworkx <codeworkx@cyanogenmod.org>2013-03-16 15:25:02 +0000
commitcba07183cc76b06a5ef2b20eef70d203dc5bcd5d (patch)
treee9847236fac724bbe929a5f2da2ad074ac47f120 /arch/arm/mm/cache-v7.S
parent1fb968ea5a15b9ff31c6345c3c4aad523985e024 (diff)
parent44655588a0b361afa15761b5c58f5a558c1c181c (diff)
downloadkernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.zip
kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.gz
kernel_samsung_smdk4412-cba07183cc76b06a5ef2b20eef70d203dc5bcd5d.tar.bz2
Merge branch 'cm-10.1-experimental' into HEAD
Diffstat (limited to 'arch/arm/mm/cache-v7.S')
-rw-r--r--arch/arm/mm/cache-v7.S3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/cache-v7.S b/arch/arm/mm/cache-v7.S
index a655d3d..82ab2c5 100644
--- a/arch/arm/mm/cache-v7.S
+++ b/arch/arm/mm/cache-v7.S
@@ -211,6 +211,9 @@ ENTRY(v7_coherent_user_range)
* isn't mapped, just try the next page.
*/
9001:
+#ifdef CONFIG_ARM_ERRATA_775420
+ dsb
+#endif
mov r12, r12, lsr #12
mov r12, r12, lsl #12
add r12, r12, #4096