Skip to content

Commit

Permalink
unicore32: switch to generic sys_execve()
Browse files Browse the repository at this point in the history
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Acked-and-Tested-by: Guan Xuetao <gxt@mprc.pku.edu.cn>
  • Loading branch information
Al Viro authored and Guan Xuetao committed Nov 9, 2012
1 parent 38e9935 commit 60541d7
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 26 deletions.
1 change: 1 addition & 0 deletions arch/unicore32/include/uapi/asm/unistd.h
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,4 @@

/* Use the standard ABI for syscalls. */
#include <asm-generic/unistd.h>
#define __ARCH_WANT_SYS_EXECVE
5 changes: 0 additions & 5 deletions arch/unicore32/kernel/entry.S
Original file line number Diff line number Diff line change
Expand Up @@ -668,11 +668,6 @@ __cr_alignment:
#endif
.ltorg

ENTRY(sys_execve)
add r3, sp, #S_OFF
b __sys_execve
ENDPROC(sys_execve)

ENTRY(sys_clone)
add ip, sp, #S_OFF
stw ip, [sp+], #4
Expand Down
21 changes: 0 additions & 21 deletions arch/unicore32/kernel/sys.c
Original file line number Diff line number Diff line change
Expand Up @@ -42,27 +42,6 @@ asmlinkage long __sys_clone(unsigned long clone_flags, unsigned long newsp,
parent_tid, child_tid);
}

/* sys_execve() executes a new program.
* This is called indirectly via a small wrapper
*/
asmlinkage long __sys_execve(const char __user *filename,
const char __user *const __user *argv,
const char __user *const __user *envp,
struct pt_regs *regs)
{
int error;
struct filename *fn;

fn = getname(filename);
error = PTR_ERR(fn);
if (IS_ERR(fn))
goto out;
error = do_execve(fn->name, argv, envp, regs);
putname(fn);
out:
return error;
}

/* Note: used by the compat code even in 64-bit Linux. */
SYSCALL_DEFINE6(mmap2, unsigned long, addr, unsigned long, len,
unsigned long, prot, unsigned long, flags,
Expand Down

0 comments on commit 60541d7

Please sign in to comment.