Home » Mailing list archives » git-commits-head » 2008 » January » 31

[POWERPC] kernel_execve is identical in 32 and 64 bit

Previous thread: [POWERPC] Use of_register_driver to implement of_register_platform_driver by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 7:59 pm. (1 message)

Next thread: [POWERPC] cell: Fix undefined reference to mmio_nvram_init by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 7:59 pm. (1 message)
[view original message]
From: Linux Kernel Mailing List
Subject: [POWERPC] kernel_execve is identical in 32 and 64 bit
Date: Wednesday, January 30, 2008 - 7:59 pm

Gitweb:     http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=94b146...
Commit:     94b146ceeee18b801ad65ea78ec02449398e8221
Parent:     aabc08dc662b7acb17ca5706533253ce10c050b1
Author:     Stephen Rothwell <sfr@canb.auug.org.au>
AuthorDate: Wed Nov 28 11:13:02 2007 +1100
Committer:  Paul Mackerras <paulus@samba.org>
CommitDate: Tue Dec 11 13:34:39 2007 +1100

    [POWERPC] kernel_execve is identical in 32 and 64 bit
    
    so consolidate it into misc.S.
    
    Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
    Signed-off-by: Paul Mackerras <paulus@samba.org>
---
 arch/powerpc/kernel/misc.S    |    8 ++++++++
 arch/powerpc/kernel/misc_32.S |    7 -------
 arch/powerpc/kernel/misc_64.S |    7 -------
 3 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/arch/powerpc/kernel/misc.S b/arch/powerpc/kernel/misc.S
index 330c9dc..74ce0c7 100644
--- a/arch/powerpc/kernel/misc.S
+++ b/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/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S
index 8b642ab..ea11378 100644
--- a/arch/powerpc/kernel/misc_32.S
+++ b/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/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S
index bbb3ba5..a3c491e 100644
--- a/arch/powerpc/kernel/misc_64.S
+++ b/arch/powerpc/kernel/misc_64.S
@@ -518,13 +518,6 @@ _GLOBAL(giveup_altivec)
 
 #endif /* CONFIG_ALTIVEC */
 ...
[ message continues ]
Previous thread: [POWERPC] Use of_register_driver to implement of_register_platform_driver by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 7:59 pm. (1 message)

Next thread: [POWERPC] cell: Fix undefined reference to mmio_nvram_init by Linux Kernel Mailing List on Wednesday, January 30, 2008 - 7:59 pm. (1 message)