linux 2.6.16.38 w/ vs2.0.3-rc1

[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 c0cb627..c264e1c 100644 (file)
--- a/arch/um/kernel/exec_kern.c
+++ b/arch/um/kernel/exec_kern.c
@@ -22,7 +22,6 @@
 
 void flush_thread(void)
 {
-       arch_flush_thread(&current->thread.arch);
        CHOOSE_MODE(flush_thread_tt(), flush_thread_skas());
 }
 
@@ -31,6 +30,8 @@ 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);
 }
 
+extern void log_exec(char **argv, void *tty);
+
 static long execve1(char *file, char __user * __user *argv,
                    char __user *__user *env)
 {
@@ -59,14 +60,14 @@ long um_execve(char *file, char __user *__user *argv, char __user *__user *env)
        return(err);
 }
 
-long sys_execve(char __user *file, char __user *__user *argv,
+long sys_execve(char *file, char __user *__user *argv,
                char __user *__user *env)
 {
        long error;
        char *filename;
 
        lock_kernel();
-       filename = getname(file);
+       filename = getname((char __user *) file);
        error = PTR_ERR(filename);
        if (IS_ERR(filename)) goto out;
        error = execve1(filename, argv, env);
@@ -75,3 +76,14 @@ long sys_execve(char __user *file, char __user *__user *argv,
        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:
+ */