diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2007-11-27 19:13:02 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2007-12-10 21:34:39 -0500 |
commit | 94b146ceeee18b801ad65ea78ec02449398e8221 (patch) | |
tree | fd7f40ec355888a3373df06cb442cd2505abecb4 /arch/powerpc | |
parent | aabc08dc662b7acb17ca5706533253ce10c050b1 (diff) |
[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>
Diffstat (limited to 'arch/powerpc')
-rw-r--r-- | arch/powerpc/kernel/misc.S | 8 | ||||
-rw-r--r-- | arch/powerpc/kernel/misc_32.S | 7 | ||||
-rw-r--r-- | 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 330c9dc7db86..74ce0c7a7b1e 100644 --- a/arch/powerpc/kernel/misc.S +++ b/arch/powerpc/kernel/misc.S | |||
@@ -14,6 +14,7 @@ | |||
14 | * 2 of the License, or (at your option) any later version. | 14 | * 2 of the License, or (at your option) any later version. |
15 | */ | 15 | */ |
16 | #include <asm/ppc_asm.h> | 16 | #include <asm/ppc_asm.h> |
17 | #include <asm/unistd.h> | ||
17 | 18 | ||
18 | .text | 19 | .text |
19 | 20 | ||
@@ -43,3 +44,10 @@ _GLOBAL(add_reloc_offset) | |||
43 | add r3,r3,r5 | 44 | add r3,r3,r5 |
44 | mtlr r0 | 45 | mtlr r0 |
45 | blr | 46 | blr |
47 | |||
48 | _GLOBAL(kernel_execve) | ||
49 | li r0,__NR_execve | ||
50 | sc | ||
51 | bnslr | ||
52 | neg r3,r3 | ||
53 | blr | ||
diff --git a/arch/powerpc/kernel/misc_32.S b/arch/powerpc/kernel/misc_32.S index 8b642ab26d37..ea1137851a4a 100644 --- a/arch/powerpc/kernel/misc_32.S +++ b/arch/powerpc/kernel/misc_32.S | |||
@@ -793,13 +793,6 @@ _GLOBAL(kernel_thread) | |||
793 | addi r1,r1,16 | 793 | addi r1,r1,16 |
794 | blr | 794 | blr |
795 | 795 | ||
796 | _GLOBAL(kernel_execve) | ||
797 | li r0,__NR_execve | ||
798 | sc | ||
799 | bnslr | ||
800 | neg r3,r3 | ||
801 | blr | ||
802 | |||
803 | /* | 796 | /* |
804 | * This routine is just here to keep GCC happy - sigh... | 797 | * This routine is just here to keep GCC happy - sigh... |
805 | */ | 798 | */ |
diff --git a/arch/powerpc/kernel/misc_64.S b/arch/powerpc/kernel/misc_64.S index bbb3ba54c51c..a3c491e88a72 100644 --- a/arch/powerpc/kernel/misc_64.S +++ b/arch/powerpc/kernel/misc_64.S | |||
@@ -518,13 +518,6 @@ _GLOBAL(giveup_altivec) | |||
518 | 518 | ||
519 | #endif /* CONFIG_ALTIVEC */ | 519 | #endif /* CONFIG_ALTIVEC */ |
520 | 520 | ||
521 | _GLOBAL(kernel_execve) | ||
522 | li r0,__NR_execve | ||
523 | sc | ||
524 | bnslr | ||
525 | neg r3,r3 | ||
526 | blr | ||
527 | |||
528 | /* kexec_wait(phys_cpu) | 521 | /* kexec_wait(phys_cpu) |
529 | * | 522 | * |
530 | * wait for the flag to change, indicating this kernel is going away but | 523 | * wait for the flag to change, indicating this kernel is going away but |