Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

xtensa: switch to generic sys_execve()

Browse source 
Signed-off-by: Max Filippov <jcmvbkbc@gmail.com>
Signed-off-by: Chris Zankel <chris@zankel.net>
This commit is contained in:
Max Filippov 2012-10-25 11:10:52 +04:00 committed by Chris Zankel
parent f0a1bf0859
commit dc241f2c17
4 changed files with 3 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/xtensa/include/asm/syscall.h
View file

@ -10,7 +10,7 @@
struct pt_regs; struct pt_regs;
struct sigaction; struct sigaction;
asmlinkage long xtensa_execve(char*, char**, char**, struct pt_regs*); asmlinkage long sys_execve(char*, char**, char**, struct pt_regs*);
asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*); asmlinkage long xtensa_clone(unsigned long, unsigned long, struct pt_regs*);
asmlinkage long xtensa_ptrace(long, long, long, long); asmlinkage long xtensa_ptrace(long, long, long, long);
asmlinkage long xtensa_sigreturn(struct pt_regs*); asmlinkage long xtensa_sigreturn(struct pt_regs*);

1
arch/xtensa/include/asm/unistd.h
View file

@ -1,6 +1,7 @@
#ifndef _XTENSA_UNISTD_H #ifndef _XTENSA_UNISTD_H
#define _XTENSA_UNISTD_H #define _XTENSA_UNISTD_H
#define __ARCH_WANT_SYS_EXECVE
#include <uapi/asm/unistd.h> #include <uapi/asm/unistd.h>
/* /*

2
arch/xtensa/include/uapi/asm/unistd.h
View file

@ -262,7 +262,7 @@ __SYSCALL(115, sys_sendmmsg, 4)
#define __NR_clone 116 #define __NR_clone 116
__SYSCALL(116, xtensa_clone, 5) __SYSCALL(116, xtensa_clone, 5)
#define __NR_execve 117 #define __NR_execve 117
__SYSCALL(117, xtensa_execve, 3) __SYSCALL(117, sys_execve, 3)
#define __NR_exit 118 #define __NR_exit 118
__SYSCALL(118, sys_exit, 1) __SYSCALL(118, sys_exit, 1)
#define __NR_exit_group 119 #define __NR_exit_group 119

25
arch/xtensa/kernel/process.c
View file

@ -373,28 +373,3 @@ long xtensa_clone(unsigned long clone_flags, unsigned long newsp,
{ {
return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid); return do_fork(clone_flags, newsp, regs, 0, parent_tid, child_tid);
} }
/*
* xtensa_execve() executes a new program.
*/
asmlinkage
long xtensa_execve(const char __user *name,
const char __user *const __user *argv,
const char __user *const __user *envp,
long a3, long a4, long a5,
struct pt_regs *regs)
{
long error;
struct filename *filename;
filename = getname(name);
error = PTR_ERR(filename);
if (IS_ERR(filename))
goto out;
error = do_execve(filename->name, argv, envp, regs);
putname(filename);
out:
return error;
}