diff options
| author | Paul Mackerras <paulus@samba.org> | 2005-11-07 04:42:09 +0100 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2005-11-07 04:42:09 +0100 |
| commit | c6135234550ed89a6fd0e8cb229633967e41d649 (patch) | |
| tree | 22cef33e314839c4fb30d6fc888c0caa2a0f6602 /arch/powerpc/kernel/process.c | |
| parent | [PATCH] powerpc: Make ppc_md.set_dabr non 64-bit specific (diff) | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild (diff) | |
| download | linux-c6135234550ed89a6fd0e8cb229633967e41d649.tar.xz linux-c6135234550ed89a6fd0e8cb229633967e41d649.zip | |
Merge ../linux-2.6
Diffstat (limited to 'arch/powerpc/kernel/process.c')
| -rw-r--r-- | arch/powerpc/kernel/process.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/powerpc/kernel/process.c b/arch/powerpc/kernel/process.c index 29f6e875cf1c..de69fb37c731 100644 --- a/arch/powerpc/kernel/process.c +++ b/arch/powerpc/kernel/process.c @@ -552,12 +552,10 @@ 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 llp = mmu_psize_defs[mmu_linear_psize].sllp; sp_vsid <<= SLB_VSID_SHIFT; - sp_vsid |= SLB_VSID_KERNEL; - if (cpu_has_feature(CPU_FTR_16M_PAGE)) - sp_vsid |= SLB_VSID_L; - + sp_vsid |= SLB_VSID_KERNEL | llp; p->thread.ksp_vsid = sp_vsid; } |