Commit cb1dcc0f authored by Richard Weinberger's avatar Richard Weinberger Committed by Linus Torvalds

uml: fix compile warning

This fixes:
incompatible pointer type:  => 89
       arch/um/kernel/exec.c: warning: passing argument 2 of 'execve1' from
incompatible pointer type:  => 69, 85
       arch/um/kernel/exec.c: warning: passing argument 3 of 'execve1' from
incompatible pointer type:  => 69, 85

which was introduced by d7627467 ("Make do_execve() take a const
filename pointer")
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
Cc: David Howells <dhowells@redhat.com>
Cc: Jeff Dike <jdike@addtoit.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 1c2499ae
...@@ -62,7 +62,7 @@ static long execve1(const char *file, ...@@ -62,7 +62,7 @@ static long execve1(const char *file,
return error; return error;
} }
long um_execve(const char *file, char __user *__user *argv, char __user *__user *env) long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env)
{ {
long err; long err;
...@@ -72,8 +72,8 @@ long um_execve(const char *file, char __user *__user *argv, char __user *__user ...@@ -72,8 +72,8 @@ long um_execve(const char *file, char __user *__user *argv, char __user *__user
return err; return err;
} }
long sys_execve(const char __user *file, char __user *__user *argv, long sys_execve(const char __user *file, const char __user *const __user *argv,
char __user *__user *env) const char __user *const __user *env)
{ {
long error; long error;
char *filename; char *filename;
......
extern long um_execve(const char *file, char __user *__user *argv, char __user *__user *env); extern long um_execve(const char *file, const char __user *const __user *argv, const char __user *const __user *env);
...@@ -60,8 +60,8 @@ int kernel_execve(const char *filename, ...@@ -60,8 +60,8 @@ int kernel_execve(const char *filename,
fs = get_fs(); fs = get_fs();
set_fs(KERNEL_DS); set_fs(KERNEL_DS);
ret = um_execve(filename, (char __user *__user *)argv, ret = um_execve(filename, (const char __user *const __user *)argv,
(char __user *__user *) envp); (const char __user *const __user *) envp);
set_fs(fs); set_fs(fs);
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment