Commit 747bea91 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc: Clean ifdef usage in copy_thread() 



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: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 6f0ef0f5

arch/powerpc/kernel/process.c

+2 −0
Original line number Diff line number Diff line
@@ -664,6 +664,7 @@ int copy_thread(unsigned long clone_flags, unsigned long usp, 
		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_flags, unsigned long usp, 
	 * 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;

CRA Git | Maintained and supported by SUSTech CRA and CCSE