Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dc241f2c authored by Max Filippov's avatar Max Filippov Committed by Chris Zankel
Browse files

xtensa: switch to generic sys_execve() 



Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
Signed-off-by: default avatarChris Zankel <chris@zankel.net>
parent f0a1bf08

arch/xtensa/include/asm/syscall.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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*);

arch/xtensa/include/asm/unistd.h

+1 −0
Original line number Original line Diff line number Diff line 
#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>





/*

/*

arch/xtensa/include/uapi/asm/unistd.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -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

arch/xtensa/kernel/process.c

+0 −25
Original line number Original line Diff line number Diff line
@@ -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;

}