upgrade to fedora-2.6.12-1.1398.FC4 + vserver 2.0.rc7

[linux-2.6.git] / arch / um / kernel / exec_kern.c

diff --git a/arch/um/kernel/exec_kern.c b/arch/um/kernel/exec_kern.c
index 4336240..efd222f 100644 (file)
--- a/arch/um/kernel/exec_kern.c
+++ b/arch/um/kernel/exec_kern.c
@@ -16,7 +16,6 @@
 #include "kern.h"
 #include "irq_user.h"
 #include "tlb.h"
-#include "2_5compat.h"
 #include "os.h"
 #include "time_user.h"
 #include "choose-mode.h"
@@ -34,7 +33,8 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
 
 extern void log_exec(char **argv, void *tty);
 
-static long execve1(char *file, char **argv, char **env)
+static long execve1(char *file, char __user * __user *argv,
+                   char *__user __user *env)
 {
         long error;
 
@@ -51,7 +51,7 @@ static long execve1(char *file, char **argv, char **env)
         return(error);
 }
 
-long um_execve(char *file, char **argv, char **env)
+long um_execve(char *file, char __user *__user *argv, char __user *__user *env)
 {
        long err;
 
@@ -61,13 +61,14 @@ long um_execve(char *file, char **argv, char **env)
        return(err);
 }
 
-long sys_execve(char *file, char **argv, char **env)
+long sys_execve(char *file, char __user *__user *argv,
+               char __user *__user *env)
 {
        long error;
        char *filename;
 
        lock_kernel();
-       filename = getname((char *) file);
+       filename = getname((char __user *) file);
        error = PTR_ERR(filename);
        if (IS_ERR(filename)) goto out;
        error = execve1(filename, argv, env);