From 1d734a4757334c3ef131078f4ae33987f2de9f28 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 28 Nov 2007 11:13:02 +1100
Subject: [PATCH] --- yaml --- r: 81001 b: refs/heads/master c:
 94b146ceeee18b801ad65ea78ec02449398e8221 h: refs/heads/master i:   80999:
 19934bd11f1c1ff0a23e1f3544bf93fd40563a8f v: v3

---
 [refs]                              | 2 +-
 trunk/arch/powerpc/kernel/misc.S    | 8 ++++++++
 trunk/arch/powerpc/kernel/misc_32.S | 7 -------
 trunk/arch/powerpc/kernel/misc_64.S | 7 -------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index f772f7b5dc28..144186d1b720 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aabc08dc662b7acb17ca5706533253ce10c050b1
+refs/heads/master: 94b146ceeee18b801ad65ea78ec02449398e8221
diff --git a/trunk/arch/powerpc/kernel/misc.S b/trunk/arch/powerpc/kernel/misc.S
index 330c9dc7db86..74ce0c7a7b1e 100644
--- a/trunk/arch/powerpc/kernel/misc.S
+++ b/trunk/arch/powerpc/kernel/misc.S
@@ -14,6 +14,7 @@
  * 2 of the License, or (at your option) any later version.
  */
 #include <asm/ppc_asm.h>
+#include <asm/unistd.h>
 
 	.text
 
@@ -43,3 +44,10 @@ _GLOBAL(add_reloc_offset)
 	add	r3,r3,r5
 	mtlr	r0
 	blr
+
+_GLOBAL(kernel_execve)
+	li	r0,__NR_execve
+	sc
+	bnslr
+	neg	r3,r3
+	blr
diff --git a/trunk/arch/powerpc/kernel/misc_32.S b/trunk/arch/powerpc/kernel/misc_32.S
index 8b642ab26d37..ea1137851a4a 100644
--- a/trunk/arch/powerpc/kernel/misc_32.S
+++ b/trunk/arch/powerpc/kernel/misc_32.S
@@ -793,13 +793,6 @@ _GLOBAL(kernel_thread)
 	addi	r1,r1,16
 	blr
 
-_GLOBAL(kernel_execve)
-	li	r0,__NR_execve
-	sc
-	bnslr
-	neg	r3,r3
-	blr
-
 /*
  * This routine is just here to keep GCC happy - sigh...
  */
diff --git a/trunk/arch/powerpc/kernel/misc_64.S b/trunk/arch/powerpc/kernel/misc_64.S
index bbb3ba54c51c..a3c491e88a72 100644
--- a/trunk/arch/powerpc/kernel/misc_64.S
+++ b/trunk/arch/powerpc/kernel/misc_64.S
@@ -518,13 +518,6 @@ _GLOBAL(giveup_altivec)
 
 #endif /* CONFIG_ALTIVEC */
 
-_GLOBAL(kernel_execve)
-	li	r0,__NR_execve
-	sc
-	bnslr
-	neg	r3,r3
-	blr
-
 /* kexec_wait(phys_cpu)
  *
  * wait for the flag to change, indicating this kernel is going away but