import PULS_20160108

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

diff --git a/arch/arm/mm/proc-v7-2level.S b/arch/arm/mm/proc-v7-2level.S
index bb20ba0f7bc729fb4acb94b2b0a0bc4286debfba..73e9f70f06e97df7b7ed9a3f3a5abeceb5c3d31d 100644 (file)
--- a/arch/arm/mm/proc-v7-2level.S
+++ b/arch/arm/mm/proc-v7-2level.S
@@ -104,8 +104,12 @@ ENTRY(cpu_v7_set_pte_ext)
  THUMB(        add     r0, r0, #2048 )
  THUMB(        str     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)