Skip to contentSkip to conversation

powerpc: Clean ifdef usage in copy_thread()

PATCH In review Benjamin Herrenschmidt 2 participants 2 messages Jul 23, 2009 PowerPC

lore
Share & tools
lore
#0 lore raw

PATCH 10/20 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.

---

 arch/powerpc/kernel/process.c |    2 ++
 1 file changed, 2 insertions(+)
arch/powerpc/kernel/process.c +2 -0
@@ -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;