From fb7f2e7b241f218abb5d37ec121c29bf34ba04f8 Mon Sep 17 00:00:00 2001
From: Miklos Szeredi <mszeredi@suse.cz>
Date: Thu, 2 Apr 2009 16:56:53 -0700
Subject: [PATCH] --- yaml --- r: 139627 b: refs/heads/master c:
 e4c2ff1cf2d7fc65d0fc6f88bc98338e0212ad52 h: refs/heads/master i:   139625:
 019bb7815dbd612629a9c44fff7f2b4ce6193586   139623:
 86942832714492dd276d85c3407beb84c46d6e87 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/um/kernel/syscall.c | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 5a0d7387bc87..dff325daa054 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7130f2f5528fd9df8f18790730e39dff9136ee33
+refs/heads/master: e4c2ff1cf2d7fc65d0fc6f88bc98338e0212ad52
diff --git a/trunk/arch/um/kernel/syscall.c b/trunk/arch/um/kernel/syscall.c
index c4df705b8359..a4625c7b2bf9 100644
--- a/trunk/arch/um/kernel/syscall.c
+++ b/trunk/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;