2 files changed, 16 insertions, 9 deletions

diff --git a/arch/powerpc/platforms/cell/spu_base.c b/arch/powerpc/platforms/cell/spu_base.c
index d5877aacc3b6..fd6ea571dbd3 100644
--- a/arch/powerpc/platforms/cell/spu_base.c
+++ b/arch/powerpc/platforms/cell/spu_base.c
@@ -71,7 +71,7 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
 {
         struct spu_priv2 __iomem *priv2 = spu->priv2;
         struct mm_struct *mm = spu->mm;
-        u64 esid, vsid;
+        u64 esid, vsid, llp;
 
         pr_debug("%s\n", __FUNCTION__);
 
@@ -91,9 +91,14 @@ static int __spu_trap_data_seg(struct spu *spu, unsigned long ea)
         }
 
         esid = (ea & ESID_MASK) | SLB_ESID_V;
-        vsid = (get_vsid(mm->context.id, ea) << SLB_VSID_SHIFT) | SLB_VSID_USER;
+#ifdef CONFIG_HUGETLB_PAGE
         if (in_hugepage_area(mm->context, ea))
-                vsid |= SLB_VSID_L;
+                llp = mmu_psize_defs[mmu_huge_psize].sllp;
+        else
+#endif
+                llp = mmu_psize_defs[mmu_virtual_psize].sllp;
+        vsid = (get_vsid(mm->context.id, ea) << SLB_VSID_SHIFT) |
+                        SLB_VSID_USER | llp;
 
         out_be64(&priv2->slb_index_W, spu->slb_replace);
         out_be64(&priv2->slb_vsid_RW, vsid);
diff --git a/arch/powerpc/platforms/cell/spufs/switch.c b/arch/powerpc/platforms/cell/spufs/switch.c
index 60f8b3616441..97a0e80c7df8 100644
--- a/arch/powerpc/platforms/cell/spufs/switch.c
+++ b/arch/powerpc/platforms/cell/spufs/switch.c
@@ -718,13 +718,15 @@ static inline void invalidate_slbs(struct spu_state *csa, struct spu *spu)
 
 static inline void get_kernel_slb(u64 ea, u64 slb[2])
 {
-        slb[0] = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) | SLB_VSID_KERNEL;
+        u64 llp;
+
+        if (REGION_ID(ea) == KERNEL_REGION_ID)
+                llp = mmu_psize_defs[mmu_linear_psize].sllp;
+        else
+                llp = mmu_psize_defs[mmu_virtual_psize].sllp;
+        slb[0] = (get_kernel_vsid(ea) << SLB_VSID_SHIFT) |
+                SLB_VSID_KERNEL | llp;
         slb[1] = (ea & ESID_MASK) | SLB_ESID_V;
-
-        /* Large pages are used for kernel text/data, but not vmalloc.  */
-        if (cpu_has_feature(CPU_FTR_16M_PAGE)
-            && REGION_ID(ea) == KERNEL_REGION_ID)
-                slb[0] |= SLB_VSID_L;
 }
 
 static inline void load_mfc_slb(struct spu *spu, u64 slb[2], int slbe)