import PULS_20160108

[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 6f3b0476b72919f4ac2786f58d7623c51162e60e..b45d73fbe547630db79cadd77ed49080326bc12d 100644 (file)
--- a/arch/arm/mm/proc-v7-3level.S
+++ b/arch/arm/mm/proc-v7-3level.S
@@ -82,7 +82,11 @@ ENTRY(cpu_v7_set_pte_ext)
        orreq   rl, #L_PTE_RDONLY
 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)