diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-09-19 13:08:13 -0400 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-10-01 00:53:58 -0400 |
commit | 8f1597e959a3cfeae8f5cfae26890710f9092443 (patch) | |
tree | ab2b435a5b7dc1e9ac9f06bfb7b26d07346de504 /arch/mn10300 | |
parent | 255461c53a91d34e2eddb8c8a2ba39e99065d7c1 (diff) |
mn10300: switch to generic sys_execve()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'arch/mn10300')
-rw-r--r-- | arch/mn10300/include/asm/ptrace.h | 1 | ||||
-rw-r--r-- | arch/mn10300/include/asm/unistd.h | 1 | ||||
-rw-r--r-- | arch/mn10300/kernel/process.c | 16 |
3 files changed, 2 insertions, 16 deletions
diff --git a/arch/mn10300/include/asm/ptrace.h b/arch/mn10300/include/asm/ptrace.h index 44251b974f1d..08ac856c053e 100644 --- a/arch/mn10300/include/asm/ptrace.h +++ b/arch/mn10300/include/asm/ptrace.h | |||
@@ -86,6 +86,7 @@ struct pt_regs { | |||
86 | #define user_mode(regs) (((regs)->epsw & EPSW_nSL) == EPSW_nSL) | 86 | #define user_mode(regs) (((regs)->epsw & EPSW_nSL) == EPSW_nSL) |
87 | #define instruction_pointer(regs) ((regs)->pc) | 87 | #define instruction_pointer(regs) ((regs)->pc) |
88 | #define user_stack_pointer(regs) ((regs)->sp) | 88 | #define user_stack_pointer(regs) ((regs)->sp) |
89 | #define current_pt_regs() current_frame() | ||
89 | 90 | ||
90 | #define arch_has_single_step() (1) | 91 | #define arch_has_single_step() (1) |
91 | 92 | ||
diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h index 866eb14749d7..a965de47b2bd 100644 --- a/arch/mn10300/include/asm/unistd.h +++ b/arch/mn10300/include/asm/unistd.h | |||
@@ -382,6 +382,7 @@ | |||
382 | #define __ARCH_WANT_SYS_SIGPROCMASK | 382 | #define __ARCH_WANT_SYS_SIGPROCMASK |
383 | #define __ARCH_WANT_SYS_RT_SIGACTION | 383 | #define __ARCH_WANT_SYS_RT_SIGACTION |
384 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND | 384 | #define __ARCH_WANT_SYS_RT_SIGSUSPEND |
385 | #define __ARCH_WANT_SYS_EXECVE | ||
385 | 386 | ||
386 | /* | 387 | /* |
387 | * "Conditional" syscalls | 388 | * "Conditional" syscalls |
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c index be87fbee4da5..49af5ca89343 100644 --- a/arch/mn10300/kernel/process.c +++ b/arch/mn10300/kernel/process.c | |||
@@ -283,22 +283,6 @@ asmlinkage long sys_vfork(void) | |||
283 | current_frame(), 0, NULL, NULL); | 283 | current_frame(), 0, NULL, NULL); |
284 | } | 284 | } |
285 | 285 | ||
286 | asmlinkage long sys_execve(const char __user *name, | ||
287 | const char __user *const __user *argv, | ||
288 | const char __user *const __user *envp) | ||
289 | { | ||
290 | char *filename; | ||
291 | int error; | ||
292 | |||
293 | filename = getname(name); | ||
294 | error = PTR_ERR(filename); | ||
295 | if (IS_ERR(filename)) | ||
296 | return error; | ||
297 | error = do_execve(filename, argv, envp, current_frame()); | ||
298 | putname(filename); | ||
299 | return error; | ||
300 | } | ||
301 | |||
302 | unsigned long get_wchan(struct task_struct *p) | 286 | unsigned long get_wchan(struct task_struct *p) |
303 | { | 287 | { |
304 | return p->thread.wchan; | 288 | return p->thread.wchan; |