Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[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 a6be6b5..c0cb627 100644 (file)
--- a/arch/um/kernel/exec_kern.c
+++ b/arch/um/kernel/exec_kern.c
@@ -16,14 +16,13 @@
 #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"
 #include "mode_kern.h"
 
 void flush_thread(void)
 {
+       arch_flush_thread(&current->thread.arch);
        CHOOSE_MODE(flush_thread_tt(), flush_thread_skas());
 }
 
@@ -32,35 +31,42 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)
        CHOOSE_MODE_PROC(start_thread_tt, start_thread_skas, regs, eip, esp);
 }
 
-static int execve1(char *file, char **argv, char **env)
+static long execve1(char *file, char __user * __user *argv,
+                   char __user *__user *env)
 {
-        int error;
+        long error;
 
+#ifdef CONFIG_TTY_LOG
+       log_exec(argv, current->tty);
+#endif
         error = do_execve(file, argv, env, &current->thread.regs);
         if (error == 0){
+               task_lock(current);
                 current->ptrace &= ~PT_DTRACE;
+               task_unlock(current);
                 set_cmdline(current_cmd());
         }
         return(error);
 }
 
-int um_execve(char *file, char **argv, char **env)
+long um_execve(char *file, char __user *__user *argv, char __user *__user *env)
 {
-       int err;
+       long err;
 
        err = execve1(file, argv, env);
-       if(!err) 
+       if(!err)
                do_longjmp(current->thread.exec_buf, 1);
        return(err);
 }
 
-int sys_execve(char *file, char **argv, char **env)
+long sys_execve(char __user *file, char __user *__user *argv,
+               char __user *__user *env)
 {
-       int error;
+       long error;
        char *filename;
 
        lock_kernel();
-       filename = getname((char *) file);
+       filename = getname(file);
        error = PTR_ERR(filename);
        if (IS_ERR(filename)) goto out;
        error = execve1(filename, argv, env);
@@ -69,14 +75,3 @@ int sys_execve(char *file, char **argv, char **env)
        unlock_kernel();
        return(error);
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */