uml: throw out CHOOSE_MODE

[linux-2.6-omap-h63xx.git] / arch / um / kernel / exec.c

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
index 121166400e25a01917df9452560e2fc12bfba882..8f774c25b7653295e60d1c0e83100b072881683c 100644 (file)
--- a/arch/um/kernel/exec.c
+++ b/arch/um/kernel/exec.c
@@ -6,29 +6,29 @@
 #include "linux/slab.h"
 #include "linux/smp_lock.h"
 #include "linux/ptrace.h"
+#include "linux/fs.h"
 #include "asm/ptrace.h"
 #include "asm/pgtable.h"
 #include "asm/tlbflush.h"
 #include "asm/uaccess.h"
-#include "user_util.h"
 #include "kern_util.h"
+#include "as-layout.h"
 #include "mem_user.h"
 #include "kern.h"
 #include "irq_user.h"
 #include "tlb.h"
 #include "os.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());
+       flush_thread_skas();
 }
 
 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);
+       start_thread_skas(regs, eip, esp);
 }
 
 #ifdef CONFIG_TTY_LOG
@@ -56,7 +56,6 @@ static long execve1(char *file, char __user * __user *argv,
                SUBARCH_EXECVE1(&current->thread.regs.regs);
 #endif
                task_unlock(current);
-                set_cmdline(current_cmd());
         }
         return(error);
 }