aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/exec.c6
-rw-r--r--arch/um/kernel/internal.h2
-rw-r--r--arch/um/kernel/syscall.c2
3 files changed, 5 insertions, 5 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 97974c1bdd12..59b20d93b6d4 100644
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -44,7 +44,7 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
44 PT_REGS_SP(regs) = esp; 44 PT_REGS_SP(regs) = esp;
45} 45}
46 46
47static long execve1(char *file, char __user * __user *argv, 47static long execve1(const char *file, char __user * __user *argv,
48 char __user *__user *env) 48 char __user *__user *env)
49{ 49{
50 long error; 50 long error;
@@ -61,7 +61,7 @@ static long execve1(char *file, char __user * __user *argv,
61 return error; 61 return error;
62} 62}
63 63
64long um_execve(char *file, char __user *__user *argv, char __user *__user *env) 64long um_execve(const char *file, char __user *__user *argv, char __user *__user *env)
65{ 65{
66 long err; 66 long err;
67 67
@@ -71,7 +71,7 @@ long um_execve(char *file, char __user *__user *argv, char __user *__user *env)
71 return err; 71 return err;
72} 72}
73 73
74long sys_execve(char __user *file, char __user *__user *argv, 74long sys_execve(const char __user *file, char __user *__user *argv,
75 char __user *__user *env) 75 char __user *__user *env)
76{ 76{
77 long error; 77 long error;
diff --git a/arch/um/kernel/internal.h b/arch/um/kernel/internal.h
index 3bda43c7a786..1303a105fe91 100644
--- a/arch/um/kernel/internal.h
+++ b/arch/um/kernel/internal.h
@@ -1 +1 @@
extern long um_execve(char *file, char __user *__user *argv, char __user *__user *env); extern long um_execve(const char *file, char __user *__user *argv, char __user *__user *env);
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index 4393173923f5..7427c0b1930c 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -58,7 +58,7 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
58 58
59 fs = get_fs(); 59 fs = get_fs();
60 set_fs(KERNEL_DS); 60 set_fs(KERNEL_DS);
61 ret = um_execve((char *)filename, (char __user *__user *)argv, 61 ret = um_execve(filename, (char __user *__user *)argv,
62 (char __user *__user *) envp); 62 (char __user *__user *) envp);
63 set_fs(fs); 63 set_fs(fs);
64 64