Merge tag 'v3.10.68' into update

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / arch / arm / mm / proc-v7-3level.S

diff --git a/arch/arm/mm/proc-v7-3level.S b/arch/arm/mm/proc-v7-3level.S
index 110e738bc970f7288d9df72b3d62995fd67b0895..29944d7e769a364ba98b6194ae4ce53cfec411f0 100644 (file)
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@ -87,7 +87,11 @@ ENTRY(cpu_v7_set_pte_ext)
 
 1:     strd    r2, r3, [r0]
        ALT_SMP(W(nop))
+#ifdef CONFIG_ARM_ERRATA_824069
+       ALT_UP (mcr     p15, 0, r0, c7, c14, 1)         @ flush_pte
+#else
        ALT_UP (mcr     p15, 0, r0, c7, c10, 1)         @ flush_pte
+#endif
 #endif
        mov     pc, lr
 ENDPROC(cpu_v7_set_pte_ext)