1 files changed, 11 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/head_44x.S b/arch/powerpc/kernel/head_44x.S
index 26237357a88c..bd4fe9e7278b 100644
--- a/arch/powerpc/kernel/head_44x.S
+++ b/arch/powerpc/kernel/head_44x.S
@@ -69,6 +69,17 @@ _ENTRY(_start);
         li      r24,0           /* CPU number */
 
 /*
+ * In case the firmware didn't do it, we apply some workarounds
+ * that are good for all 440 core variants here
+ */
+        mfspr   r3,SPRN_CCR0
+        rlwinm  r3,r3,0,0,27    /* disable icache prefetch */
+        isync
+        mtspr   SPRN_CCR0,r3
+        isync
+        sync
+
+/*
  * Set up the initial MMU state
  *
  * We are still executing code at the virtual address
@@ -570,7 +581,6 @@ finish_tlb_load:
         rlwimi  r10,r12,29,30,30                /* DIRTY -> SW position */
         and     r11,r12,r10                     /* Mask PTE bits to keep */
         andi.   r10,r12,_PAGE_USER              /* User page ? */
-        ori     r11,r11,_PAGE_GUARDED           /* 440 errata, needs G set */
         beq     1f                              /* nope, leave U bits empty */
         rlwimi  r11,r11,3,26,28                 /* yes, copy S bits to U */
 1:      tlbwe   r11,r13,PPC44x_TLB_ATTRIB       /* Write ATTRIB */