Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

[firefly-linux-kernel-4.4.55.git] / arch / powerpc / kernel / head_44x.S

diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index c334f53453f708ea64c7d9c1322cc92418a5b687..b5061abbd2e0c1df269f424905f56c5e429167b1 100644 (file)
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -1210,10 +1210,12 @@ clear_utlb_entry:
 
        /* We configure icbi to invalidate 128 bytes at a time since the
         * current 32-bit kernel code isn't too happy with icache != dcache
-        * block size
+        * block size. We also disable the BTAC as this can cause errors
+        * in some circumstances (see IBM Erratum 47).
         */
        mfspr   r3,SPRN_CCR0
        oris    r3,r3,0x0020
+       ori     r3,r3,0x0040
        mtspr   SPRN_CCR0,r3
        isync