Merge tag 'powerpc-4.8-2' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc...

[deliverable/linux.git] / arch / arm / mm / proc-v7.S

diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S
index eefc10ff8e7e871d3d9cba136dc81dc5d70c585f..a7123b4e129dfc40f9c0d0df4417d086e23ee9a0 100644 (file)
--- a/arch/arm/mm/proc-v7.S
+++ b/arch/arm/mm/proc-v7.S
@@ -372,10 +372,21 @@ __ca12_errata:
        mrc     p15, 0, r10, c15, c0, 2         @ read internal feature reg
        orr     r10, r10, #1 << 1               @ set bit #1
        mcr     p15, 0, r10, c15, c0, 2         @ write internal feature reg
+#endif
+#ifdef CONFIG_ARM_ERRATA_825619
+       mrc     p15, 0, r10, c15, c0, 1         @ read diagnostic register
+       orr     r10, r10, #1 << 24              @ set bit #24
+       mcr     p15, 0, r10, c15, c0, 1         @ write diagnostic register
 #endif
        b       __errata_finish
 
 __ca17_errata:
+#ifdef CONFIG_ARM_ERRATA_852421
+       cmp     r6, #0x12                       @ only present up to r1p2
+       mrcle   p15, 0, r10, c15, c0, 1         @ read diagnostic register
+       orrle   r10, r10, #1 << 24              @ set bit #24
+       mcrle   p15, 0, r10, c15, c0, 1         @ write diagnostic register
+#endif
 #ifdef CONFIG_ARM_ERRATA_852423
        cmp     r6, #0x12                       @ only present up to r1p2
        mrcle   p15, 0, r10, c15, c0, 1         @ read diagnostic register