1 files changed, 7 insertions, 7 deletions

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 64ecb1603a77..4ea6e1a7e4b9 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -173,7 +173,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
 
         /* grab and fixup the RPN */
         mfspr   r6,SPRN_MAS1    /* extract MAS1[SIZE] */
-        rlwinm  r6,r6,25,27,30
+        rlwinm  r6,r6,25,27,31
         li      r8,-1
         addi    r6,r6,10
         slw     r6,r8,r6        /* convert to mask */
@@ -199,7 +199,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
         xori    r6,r4,1         /* Setup TMP mapping in the other Address space */
         slwi    r6,r6,12
         oris    r6,r6,(MAS1_VALID|MAS1_IPROT)@h
-        ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_4K))@l
+        ori     r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_4K))@l
         mtspr   SPRN_MAS1,r6
         mfspr   r6,SPRN_MAS2
         li      r7,0            /* temp EPN = 0 */
@@ -257,10 +257,10 @@ skpinv:	addi	r6,r6,1				/* Increment */
         lis     r6,0x1000               /* Set MAS0(TLBSEL) = TLB1(1), ESEL = 0 */
         mtspr   SPRN_MAS0,r6
         lis     r6,(MAS1_VALID|MAS1_IPROT)@h
-        ori     r6,r6,(MAS1_TSIZE(BOOKE_PAGESZ_64M))@l
+        ori     r6,r6,(MAS1_TSIZE(BOOK3E_PAGESZ_64M))@l
         mtspr   SPRN_MAS1,r6
-        lis     r6,MAS2_VAL(PAGE_OFFSET, BOOKE_PAGESZ_64M, M_IF_SMP)@h
-        ori     r6,r6,MAS2_VAL(PAGE_OFFSET, BOOKE_PAGESZ_64M, M_IF_SMP)@l
+        lis     r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_SMP)@h
+        ori     r6,r6,MAS2_VAL(PAGE_OFFSET, BOOK3E_PAGESZ_64M, M_IF_SMP)@l
         mtspr   SPRN_MAS2,r6
         mtspr   SPRN_MAS3,r8
         tlbwe
@@ -315,7 +315,7 @@ skpinv:	addi	r6,r6,1				/* Increment */
         mtspr   SPRN_IVPR,r4
 
         /* Setup the defaults for TLB entries */
-        li      r2,(MAS4_TSIZED(BOOKE_PAGESZ_4K))@l
+        li      r2,(MAS4_TSIZED(BOOK3E_PAGESZ_4K))@l
 #ifdef CONFIG_E200
         oris    r2,r2,MAS4_TLBSELD(1)@h
 #endif
@@ -1116,7 +1116,7 @@ __secondary_start:
         mtspr   SPRN_SPRG3,r4
 
         /* Setup the defaults for TLB entries */
-        li      r4,(MAS4_TSIZED(BOOKE_PAGESZ_4K))@l
+        li      r4,(MAS4_TSIZED(BOOK3E_PAGESZ_4K))@l
         mtspr   SPRN_MAS4,r4
 
         /* Jump to start_secondary */