diff options
author | Arnd Bergmann <arnd@arndb.de> | 2006-10-02 05:18:34 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-10-02 10:57:23 -0400 |
commit | fe74290d51bc08e9b90ed7c145d74a22cd50b90e (patch) | |
tree | bec3a117a95a1ace6dba6a76b3edbd6297d40b63 /arch/sh | |
parent | 3db03b4afb3ecd66a0399b8ba57742ca953b0ecd (diff) |
[PATCH] provide kernel_execve on all architectures
This adds the new kernel_execve function on all architectures that were using
_syscall3() to implement execve.
The implementation uses code from the _syscall3 macros provided in the
unistd.h header file. I don't have cross-compilers for any of these
architectures, so the patch is untested with the exception of i386.
Most architectures can probably implement this in a nicer way in assembly or
by combining it with the sys_execve implementation itself, but this should do
it for now.
[bunk@stusta.de: m68knommu build fix]
[markh@osdl.org: build fix]
[bero@arklinux.org: build fix]
[ralf@linux-mips.org: mips fix]
[schwidefsky@de.ibm.com: s390 fix]
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Andi Kleen <ak@muc.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
Cc: Russell King <rmk@arm.linux.org.uk>
Cc: Ian Molton <spyro@f2s.com>
Cc: Mikael Starvik <starvik@axis.com>
Cc: David Howells <dhowells@redhat.com>
Cc: Yoshinori Sato <ysato@users.sourceforge.jp>
Cc: Hirokazu Takata <takata.hirokazu@renesas.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: Kyle McMartin <kyle@mcmartin.ca>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Mundt <lethal@linux-sh.org>
Cc: Kazumoto Kojima <kkojima@rr.iij4u.or.jp>
Cc: Richard Curnow <rc@rc0.org.uk>
Cc: William Lee Irwin III <wli@holomorphy.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Cc: Miles Bader <uclinux-v850@lsi.nec.co.jp>
Cc: Chris Zankel <chris@zankel.net>
Cc: "Luck, Tony" <tony.luck@intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Signed-off-by: Bernhard Rosenkraenzer <bero@arklinux.org>
Signed-off-by: Mark Haverkamp <markh@osdl.org>
Signed-off-by: Adrian Bunk <bunk@stusta.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/sh')
-rw-r--r-- | arch/sh/kernel/sys_sh.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/arch/sh/kernel/sys_sh.c b/arch/sh/kernel/sys_sh.c index 11c2acde6eaa..8fde95001c34 100644 --- a/arch/sh/kernel/sys_sh.c +++ b/arch/sh/kernel/sys_sh.c | |||
@@ -25,6 +25,7 @@ | |||
25 | #include <asm/cacheflush.h> | 25 | #include <asm/cacheflush.h> |
26 | #include <asm/uaccess.h> | 26 | #include <asm/uaccess.h> |
27 | #include <asm/ipc.h> | 27 | #include <asm/ipc.h> |
28 | #include <asm/unistd.h> | ||
28 | 29 | ||
29 | /* | 30 | /* |
30 | * sys_pipe() is the normal C calling standard for creating | 31 | * sys_pipe() is the normal C calling standard for creating |
@@ -309,3 +310,19 @@ asmlinkage int sys_fadvise64_64_wrapper(int fd, u32 offset0, u32 offset1, | |||
309 | (u64)len0 << 32 | len1, advice); | 310 | (u64)len0 << 32 | len1, advice); |
310 | #endif | 311 | #endif |
311 | } | 312 | } |
313 | |||
314 | /* | ||
315 | * Do a system call from kernel instead of calling sys_execve so we | ||
316 | * end up with proper pt_regs. | ||
317 | */ | ||
318 | int kernel_execve(const char *filename, char *const argv[], char *const envp[]) | ||
319 | { | ||
320 | register long __sc0 __asm__ ("r3") = __NR_execve; | ||
321 | register long __sc4 __asm__ ("r4") = (long) filename; | ||
322 | register long __sc5 __asm__ ("r5") = (long) argv; | ||
323 | register long __sc6 __asm__ ("r6") = (long) envp; | ||
324 | __asm__ __volatile__ ("trapa #0x13" : "=z" (__sc0) | ||
325 | : "0" (__sc0), "r" (__sc4), "r" (__sc5), "r" (__sc6) | ||
326 | : "memory"); | ||
327 | return __sc0; | ||
328 | } | ||