1 files changed, 18 insertions, 8 deletions

diff --git a/arch/powerpc/kernel/head_fsl_booke.S b/arch/powerpc/kernel/head_fsl_booke.S
index 3cb52fa0eda..590304c24da 100644
--- a/arch/powerpc/kernel/head_fsl_booke.S
+++ b/arch/powerpc/kernel/head_fsl_booke.S
@@ -422,7 +422,6 @@ skpinv:	addi	r6,r6,1				/* Increment */
  *   r12 is pointer to the pte
  */
 #ifdef CONFIG_PTE_64BIT
-#define PTE_FLAGS_OFFSET        4
 #define FIND_PTE        \
         rlwinm  r12, r10, 13, 19, 29;   /* Compute pgdir/pmd offset */  \
         lwzx    r11, r12, r11;          /* Get pgd/pmd entry */         \
@@ -431,7 +430,6 @@ skpinv:	addi	r6,r6,1				/* Increment */
         rlwimi  r12, r10, 23, 20, 28;   /* Compute pte address */       \
         lwz     r11, 4(r12);            /* Get pte entry */
 #else
-#define PTE_FLAGS_OFFSET        0
 #define FIND_PTE        \
         rlwimi  r11, r10, 12, 20, 29;   /* Create L1 (pgdir/pmd) address */     \
         lwz     r11, 0(r11);            /* Get L1 entry */                      \
@@ -579,13 +577,19 @@ interrupt_base:
 
         FIND_PTE
         andc.   r13,r13,r11             /* Check permission */
-        bne     2f                      /* Bail if permission mismach */
 
 #ifdef CONFIG_PTE_64BIT
-        lwz     r13, 0(r12)
+#ifdef CONFIG_SMP
+        subf    r10,r11,r12             /* create false data dep */
+        lwzx    r13,r11,r10             /* Get upper pte bits */
+#else
+        lwz     r13,0(r12)              /* Get upper pte bits */
+#endif
 #endif
 
-         /* Jump to common tlb load */
+        bne     2f                      /* Bail if permission/valid mismach */
+
+        /* Jump to common tlb load */
         b       finish_tlb_load
 2:
         /* The bailout.  Restore registers to pre-exception conditions
@@ -640,12 +644,18 @@ interrupt_base:
 
         FIND_PTE
         andc.   r13,r13,r11             /* Check permission */
-        bne     2f                      /* Bail if permission mismach */
 
 #ifdef CONFIG_PTE_64BIT
-        lwz     r13, 0(r12)
+#ifdef CONFIG_SMP
+        subf    r10,r11,r12             /* create false data dep */
+        lwzx    r13,r11,r10             /* Get upper pte bits */
+#else
+        lwz     r13,0(r12)              /* Get upper pte bits */
+#endif
 #endif
 
+        bne     2f                      /* Bail if permission mismach */
+
         /* Jump to common TLB load point */
         b       finish_tlb_load
 
@@ -702,7 +712,7 @@ interrupt_base:
 /*
  * Both the instruction and data TLB miss get to this
  * point to load the TLB.
- *      r10 - EA of fault
+ *      r10 - available to use
  *      r11 - TLB (info from Linux PTE)
  *      r12 - available to use
  *      r13 - upper bits of PTE (if PTE_64BIT) or available to use