1 files changed, 16 insertions, 19 deletions

diff --git a/arch/ppc64/mm/slb_low.S b/arch/ppc64/mm/slb_low.S
index 8379d678f70f..698d6b9ed6d1 100644
--- a/arch/ppc64/mm/slb_low.S
+++ b/arch/ppc64/mm/slb_low.S
@@ -89,32 +89,29 @@ END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
         b       9f
 
 0:      /* user address: proto-VSID = context<<15 | ESID */
-        li      r11,SLB_VSID_USER
-
-        srdi.   r9,r3,13
+        srdi.   r9,r3,USER_ESID_BITS
         bne-    8f                      /* invalid ea bits set */
 
 #ifdef CONFIG_HUGETLB_PAGE
 BEGIN_FTR_SECTION
-        /* check against the hugepage ranges */
-        cmpldi  r3,(TASK_HPAGE_END>>SID_SHIFT)
-        bge     6f                      /* >= TASK_HPAGE_END */
-        cmpldi  r3,(TASK_HPAGE_BASE>>SID_SHIFT)
-        bge     5f                      /* TASK_HPAGE_BASE..TASK_HPAGE_END */
-        cmpldi  r3,16
-        bge     6f                      /* 4GB..TASK_HPAGE_BASE */
-
-        lhz     r9,PACAHTLBSEGS(r13)
-        srd     r9,r9,r3
-        andi.   r9,r9,1
-        beq     6f
-
-5:      /* this is a hugepage user address */
-        li      r11,(SLB_VSID_USER|SLB_VSID_L)
+        lhz     r9,PACAHIGHHTLBAREAS(r13)
+        srdi    r11,r3,(HTLB_AREA_SHIFT-SID_SHIFT)
+        srd     r9,r9,r11
+        lhz     r11,PACALOWHTLBAREAS(r13)
+        srd     r11,r11,r3
+        or      r9,r9,r11
+END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
+#endif /* CONFIG_HUGETLB_PAGE */
+
+        li      r11,SLB_VSID_USER
+
+#ifdef CONFIG_HUGETLB_PAGE
+BEGIN_FTR_SECTION
+        rldimi  r11,r9,8,55             /* shift masked bit into SLB_VSID_L */
 END_FTR_SECTION_IFSET(CPU_FTR_16M_PAGE)
 #endif /* CONFIG_HUGETLB_PAGE */
 
-6:      ld      r9,PACACONTEXTID(r13)
+        ld      r9,PACACONTEXTID(r13)
         rldimi  r3,r9,USER_ESID_BITS,0
 
 9:      /* r3 = protovsid, r11 = flags, r10 = esid_data, cr7 = <>KERNELBASE */