aboutsummaryrefslogtreecommitdiffstats
path: root/arch/tile/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r--arch/tile/kernel/compat.c1
-rw-r--r--arch/tile/kernel/intvec_64.S1
-rw-r--r--arch/tile/kernel/process.c6
3 files changed, 3 insertions, 5 deletions
diff --git a/arch/tile/kernel/compat.c b/arch/tile/kernel/compat.c
index d67459b9ac2a..a8e5a847037c 100644
--- a/arch/tile/kernel/compat.c
+++ b/arch/tile/kernel/compat.c
@@ -103,7 +103,6 @@ long compat_sys_sched_rr_get_interval(compat_pid_t pid,
103#define compat_sys_readahead sys32_readahead 103#define compat_sys_readahead sys32_readahead
104 104
105/* Call the trampolines to manage pt_regs where necessary. */ 105/* Call the trampolines to manage pt_regs where necessary. */
106#define compat_sys_execve _compat_sys_execve
107#define compat_sys_sigaltstack _compat_sys_sigaltstack 106#define compat_sys_sigaltstack _compat_sys_sigaltstack
108#define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn 107#define compat_sys_rt_sigreturn _compat_sys_rt_sigreturn
109#define sys_clone _sys_clone 108#define sys_clone _sys_clone
diff --git a/arch/tile/kernel/intvec_64.S b/arch/tile/kernel/intvec_64.S
index 7c06d597ffd0..73f6c0a648c4 100644
--- a/arch/tile/kernel/intvec_64.S
+++ b/arch/tile/kernel/intvec_64.S
@@ -1194,7 +1194,6 @@ PTREGS_SYSCALL(sys_execve, r3)
1194PTREGS_SYSCALL(sys_sigaltstack, r2) 1194PTREGS_SYSCALL(sys_sigaltstack, r2)
1195PTREGS_SYSCALL_SIGRETURN(sys_rt_sigreturn, r0) 1195PTREGS_SYSCALL_SIGRETURN(sys_rt_sigreturn, r0)
1196#ifdef CONFIG_COMPAT 1196#ifdef CONFIG_COMPAT
1197PTREGS_SYSCALL(compat_sys_execve, r3)
1198PTREGS_SYSCALL(compat_sys_sigaltstack, r2) 1197PTREGS_SYSCALL(compat_sys_sigaltstack, r2)
1199PTREGS_SYSCALL_SIGRETURN(compat_sys_rt_sigreturn, r0) 1198PTREGS_SYSCALL_SIGRETURN(compat_sys_rt_sigreturn, r0)
1200#endif 1199#endif
diff --git a/arch/tile/kernel/process.c b/arch/tile/kernel/process.c
index 307d010696c9..9dc139127f86 100644
--- a/arch/tile/kernel/process.c
+++ b/arch/tile/kernel/process.c
@@ -614,8 +614,7 @@ out:
614#ifdef CONFIG_COMPAT 614#ifdef CONFIG_COMPAT
615long compat_sys_execve(const char __user *path, 615long compat_sys_execve(const char __user *path,
616 compat_uptr_t __user *argv, 616 compat_uptr_t __user *argv,
617 compat_uptr_t __user *envp, 617 compat_uptr_t __user *envp)
618 struct pt_regs *regs)
619{ 618{
620 long error; 619 long error;
621 struct filename *filename; 620 struct filename *filename;
@@ -624,7 +623,8 @@ long compat_sys_execve(const char __user *path,
624 error = PTR_ERR(filename); 623 error = PTR_ERR(filename);
625 if (IS_ERR(filename)) 624 if (IS_ERR(filename))
626 goto out; 625 goto out;
627 error = compat_do_execve(filename->name, argv, envp, regs); 626 error = compat_do_execve(filename->name, argv, envp,
627 current_pt_regs());
628 putname(filename); 628 putname(filename);
629 if (error == 0) 629 if (error == 0)
630 single_step_execve(); 630 single_step_execve();