2 files changed, 3 insertions, 2 deletions

diff --git a/arch/um/kernel/process.c b/arch/um/kernel/process.c
index a1c6d07cac3..4a28a1568d8 100644
--- a/arch/um/kernel/process.c
+++ b/arch/um/kernel/process.c
@@ -179,7 +179,7 @@ void fork_handler(void)
         userspace(&current->thread.regs.regs);
 }
 
-int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
+int copy_thread(unsigned long clone_flags, unsigned long sp,
                 unsigned long stack_top, struct task_struct * p,
                 struct pt_regs *regs)
 {
diff --git a/arch/um/kernel/syscall.c b/arch/um/kernel/syscall.c
index c4df705b835..a4625c7b2bf 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;