| Message ID | 20090723055956.91CDBDDD1B@ozlabs.org (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Commit | 747bea91b764aefd59091ebff80f182282f1d23c |
| Headers | show |
On Jul 23, 2009, at 12:59 AM, Benjamin Herrenschmidt wrote: > 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> > --- > > arch/powerpc/kernel/process.c | 2 ++ > 1 file changed, 2 insertions(+) Acked-by: Kumar Gala <galak@kernel.crashing.org> - k
--- linux-work.orig/arch/powerpc/kernel/process.c 2009-07-22 16:30:49.000000000 +1000 +++ linux-work/arch/powerpc/kernel/process.c 2009-07-22 16:31:02.000000000 +1000 @@ -664,6 +664,7 @@ int copy_thread(unsigned long clone_flag sp_vsid |= SLB_VSID_KERNEL | llp; p->thread.ksp_vsid = sp_vsid; } +#endif /* CONFIG_PPC_STD_MMU_64 */ /* * The PPC64 ABI makes use of a TOC to contain function @@ -671,6 +672,7 @@ int copy_thread(unsigned long clone_flag * to the TOC entry. The first entry is a pointer to the actual * function. */ +#ifdef CONFIG_PPC64 kregs->nip = *((unsigned long *)ret_from_fork); #else kregs->nip = (unsigned long)ret_from_fork;
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> --- arch/powerpc/kernel/process.c | 2 ++ 1 file changed, 2 insertions(+)