diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-18 22:25:02 -0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-01 00:53:10 -0400 |
| commit | 460dabab73f2f60198c37ed7bf6d192d23eaa286 (patch) | |
| tree | 6bace3cc9bf5127ad23b7fb9019bd21f40bdf1fa /arch | |
| parent | 02ce496f152df87be081a64796498942c433a2fd (diff) | |
| download | linux-460dabab73f2f60198c37ed7bf6d192d23eaa286.tar.gz | |
frv: switch to generic sys_execve()
current_pt_regs() here is simply __frame Acked-by: David Howells <dhowells@redhat.com> Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/frv/include/asm/ptrace.h | 1 | ||||
| -rw-r--r-- | arch/frv/include/asm/unistd.h | 1 | ||||
| -rw-r--r-- | arch/frv/kernel/process.c | 19 |
3 files changed, 2 insertions, 19 deletions
diff --git a/arch/frv/include/asm/ptrace.h b/arch/frv/include/asm/ptrace.h index ef6635ca4ecb..bd534b2d0258 100644 --- a/arch/frv/include/asm/ptrace.h +++ b/arch/frv/include/asm/ptrace.h @@ -76,6 +76,7 @@ register struct pt_regs *__frame asm("gr28"); #define user_mode(regs) (!((regs)->psr & PSR_S)) #define instruction_pointer(regs) ((regs)->pc) #define user_stack_pointer(regs) ((regs)->sp) +#define current_pt_regs() (__frame) extern unsigned long user_stack(const struct pt_regs *); #define profile_pc(regs) ((regs)->pc) diff --git a/arch/frv/include/asm/unistd.h b/arch/frv/include/asm/unistd.h index 67f23a311db6..24b64034866c 100644 --- a/arch/frv/include/asm/unistd.h +++ b/arch/frv/include/asm/unistd.h @@ -372,6 +372,7 @@ #define __ARCH_WANT_SYS_SIGPROCMASK #define __ARCH_WANT_SYS_RT_SIGACTION #define __ARCH_WANT_SYS_RT_SIGSUSPEND +#define __ARCH_WANT_SYS_EXECVE /* * "Conditional" syscalls diff --git a/arch/frv/kernel/process.c b/arch/frv/kernel/process.c index 0f02dee25e26..7ff4dbef0567 100644 --- a/arch/frv/kernel/process.c +++ b/arch/frv/kernel/process.c @@ -207,25 +207,6 @@ int copy_thread(unsigned long clone_flags, return 0; } /* end copy_thread() */ -/* - * sys_execve() executes a new program. - */ -asmlinkage int sys_execve(const char __user *name, - const char __user *const __user *argv, - const char __user *const __user *envp) -{ - int error; - char * filename; - - filename = getname(name); - error = PTR_ERR(filename); - if (IS_ERR(filename)) - return error; - error = do_execve(filename, argv, envp, __frame); - putname(filename); - return error; -} - unsigned long get_wchan(struct task_struct *p) { struct pt_regs *regs0; |