summary refs log tree commit diff
path: root/arch/um
diff options
context:
space:
mode:
authorMiklos Szeredi <mszeredi@suse.cz>2009-04-02 16:56:53 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-04-02 19:04:50 -0700
commite4c2ff1cf2d7fc65d0fc6f88bc98338e0212ad52 (patch)
tree340dffee06940d8ad4b8f7843f4389f727532e62 /arch/um
parent7130f2f5528fd9df8f18790730e39dff9136ee33 (diff)
downloadlinux-e4c2ff1cf2d7fc65d0fc6f88bc98338e0212ad52.tar.gz
uml: fix warnings in kernel_execve
Fix the following warnings:

arch/um/kernel/syscall.c: In function 'kernel_execve':
arch/um/kernel/syscall.c:130: warning: passing argument 1 of 'um_execve' discards qualifiers from pointer target type
arch/um/kernel/syscall.c:130: warning: passing argument 2 of 'um_execve' discards qualifiers from pointer target type
arch/um/kernel/syscall.c:130: warning: passing argument 3 of 'um_execve' discards qualifiers from pointer target type

Signed-off-by: Miklos Szeredi <mszeredi@suse.cz>
Cc: Jeff Dike <jdike@addtoit.com>
Cc: WANG Cong <xiyou.wangcong@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/kernel/syscall.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index c4df705b8359..a4625c7b2bf9 100644
--- a/arch/um/kernel/syscall.c
+++ b/arch/um/kernel/syscall.c
@@ -127,7 +127,8 @@ int kernel_execve(const char *filename, char *const argv[], char *const envp[])
 
 	fs = get_fs();
 	set_fs(KERNEL_DS);
-	ret = um_execve(filename, argv, envp);
+	ret = um_execve((char *)filename, (char __user *__user *)argv,
+			(char __user *__user *) envp);
 	set_fs(fs);
 
 	return ret;