1 files changed, 7 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c
index 15998b57767c..7949c203cb89 100644
--- a/arch/powerpc/kernel/process.c
+++ b/arch/powerpc/kernel/process.c
@@ -564,10 +564,15 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long usp,
 
 #ifdef CONFIG_PPC64
         if (cpu_has_feature(CPU_FTR_SLB)) {
-                unsigned long sp_vsid = get_kernel_vsid(sp);
+                unsigned long sp_vsid;
                 unsigned long llp = mmu_psize_defs[mmu_linear_psize].sllp;
 
-                sp_vsid <<= SLB_VSID_SHIFT;
+                if (cpu_has_feature(CPU_FTR_1T_SEGMENT))
+                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_1T)
+                                << SLB_VSID_SHIFT_1T;
+                else
+                        sp_vsid = get_kernel_vsid(sp, MMU_SEGSIZE_256M)
+                                << SLB_VSID_SHIFT;
                 sp_vsid |= SLB_VSID_KERNEL | llp;
                 p->thread.ksp_vsid = sp_vsid;
         }