consolidate sys_execve() prototype
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>hifive-unleashed-5.1
parent
f4091322d7
commit
6b94631f9e
|
@ -25,12 +25,9 @@ typedef long (*syscall_fn)(unsigned long, unsigned long,
|
||||||
unsigned long, unsigned long,
|
unsigned long, unsigned long,
|
||||||
unsigned long, unsigned long);
|
unsigned long, unsigned long);
|
||||||
|
|
||||||
asmlinkage int sys_execve(char __user *ufilename, char __user * __user *argv,
|
|
||||||
char __user * __user *envp);
|
|
||||||
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
|
asmlinkage int sys_clone(unsigned long clone_flags, unsigned long newsp,
|
||||||
unsigned long parent_tidp, unsigned long child_tidp);
|
unsigned long parent_tidp, unsigned long child_tidp);
|
||||||
|
|
||||||
#define sys_execve sys_execve
|
|
||||||
#define sys_clone sys_clone
|
#define sys_clone sys_clone
|
||||||
|
|
||||||
#include <asm-generic/syscalls.h>
|
#include <asm-generic/syscalls.h>
|
||||||
|
|
|
@ -65,13 +65,9 @@ long sys_ftruncate64(unsigned int fd, loff_t length);
|
||||||
/* Provide versions of standard syscalls that use current_pt_regs(). */
|
/* Provide versions of standard syscalls that use current_pt_regs(). */
|
||||||
long sys_clone(unsigned long clone_flags, unsigned long newsp,
|
long sys_clone(unsigned long clone_flags, unsigned long newsp,
|
||||||
void __user *parent_tid, void __user *child_tid);
|
void __user *parent_tid, void __user *child_tid);
|
||||||
long sys_execve(const char __user *filename,
|
|
||||||
const char __user *const __user *argv,
|
|
||||||
const char __user *const __user *envp);
|
|
||||||
long sys_rt_sigreturn(void);
|
long sys_rt_sigreturn(void);
|
||||||
long sys_sigaltstack(const stack_t __user *, stack_t __user *);
|
long sys_sigaltstack(const stack_t __user *, stack_t __user *);
|
||||||
#define sys_clone sys_clone
|
#define sys_clone sys_clone
|
||||||
#define sys_execve sys_execve
|
|
||||||
#define sys_rt_sigreturn sys_rt_sigreturn
|
#define sys_rt_sigreturn sys_rt_sigreturn
|
||||||
#define sys_sigaltstack sys_sigaltstack
|
#define sys_sigaltstack sys_sigaltstack
|
||||||
|
|
||||||
|
|
|
@ -23,9 +23,6 @@ long sys_iopl(unsigned int, struct pt_regs *);
|
||||||
/* kernel/process.c */
|
/* kernel/process.c */
|
||||||
int sys_fork(struct pt_regs *);
|
int sys_fork(struct pt_regs *);
|
||||||
int sys_vfork(struct pt_regs *);
|
int sys_vfork(struct pt_regs *);
|
||||||
long sys_execve(const char __user *,
|
|
||||||
const char __user *const __user *,
|
|
||||||
const char __user *const __user *);
|
|
||||||
long sys_clone(unsigned long, unsigned long, void __user *,
|
long sys_clone(unsigned long, unsigned long, void __user *,
|
||||||
void __user *, struct pt_regs *);
|
void __user *, struct pt_regs *);
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,6 @@
|
||||||
|
|
||||||
struct pt_regs;
|
struct pt_regs;
|
||||||
struct sigaction;
|
struct sigaction;
|
||||||
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*);
|
||||||
|
|
|
@ -21,13 +21,6 @@ asmlinkage long sys_fork(void);
|
||||||
asmlinkage long sys_vfork(void);
|
asmlinkage long sys_vfork(void);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifndef sys_execve
|
|
||||||
asmlinkage long sys_execve(const char __user *filename,
|
|
||||||
const char __user *const __user *argv,
|
|
||||||
const char __user *const __user *envp,
|
|
||||||
struct pt_regs *regs);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifndef sys_mmap2
|
#ifndef sys_mmap2
|
||||||
asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
|
asmlinkage long sys_mmap2(unsigned long addr, unsigned long len,
|
||||||
unsigned long prot, unsigned long flags,
|
unsigned long prot, unsigned long flags,
|
||||||
|
|
|
@ -837,6 +837,9 @@ int kernel_execve(const char *filename, const char *const argv[], const char *co
|
||||||
current_pt_regs())
|
current_pt_regs())
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
asmlinkage long sys_execve(const char __user *filename,
|
||||||
|
const char __user *const __user *argv,
|
||||||
|
const char __user *const __user *envp);
|
||||||
|
|
||||||
asmlinkage long sys_perf_event_open(
|
asmlinkage long sys_perf_event_open(
|
||||||
struct perf_event_attr __user *attr_uptr,
|
struct perf_event_attr __user *attr_uptr,
|
||||||
|
|
Loading…
Reference in New Issue