iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

powerpc: Clean ifdef usage in copy_thread()

Browse Source 
Currently, a single ifdef covers SLB related bits and more generic ppc64
related bits, split this in two separate ifdef's since 64-bit BookE will
need one but not the other.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
Benjamin Herrenschmidt 2009-07-23 23:15:27 +00:00
parent 6f0ef0f505
commit 747bea91b7
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/powerpc/kernel/process.c
View File

@ -664,6 +664,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
sp_vsid |= SLB_VSID_KERNEL | llp; sp_vsid |= SLB_VSID_KERNEL | llp;
p->thread.ksp_vsid = sp_vsid; p->thread.ksp_vsid = sp_vsid;
} }
#endif /* CONFIG_PPC_STD_MMU_64 */
/* /*
* The PPC64 ABI makes use of a TOC to contain function * The PPC64 ABI makes use of a TOC to contain function
@ -671,6 +672,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp,
* to the TOC entry. The first entry is a pointer to the actual * to the TOC entry. The first entry is a pointer to the actual
* function. * function.
*/ */
#ifdef CONFIG_PPC64
kregs->nip = *((unsigned long *)ret_from_fork); kregs->nip = *((unsigned long *)ret_from_fork);
#else #else
kregs->nip = (unsigned long)ret_from_fork; kregs->nip = (unsigned long)ret_from_fork;