[PATCH] uml: move _kern.c files

Move most *_kern.c files in arch/um/kernel to *.c.  This makes UML somewhat
more closely resemble the other arches.

[akpm@osdl.org: use the new INTF_* flags]
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 86 insertions, 0 deletions

diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c
new file mode 100644
index 000000000000..fc38a6d5906d
--- /dev/null
+++ b/arch/um/kernel/exec.c
@@ -0,0 +1,86 @@
+/*
+ * Copyright (C) 2000, 2001 Jeff Dike (jdike@karaya.com)
+ * Licensed under the GPL
+ */
+
+#include "linux/slab.h"
+#include "linux/smp_lock.h"
+#include "linux/ptrace.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 "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());
+}
+
+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);
+}
+
+#ifdef CONFIG_TTY_LOG
+extern void log_exec(char **argv, void *tty);
+#endif
+
+static long execve1(char *file, char __user * __user *argv,
+                    char __user *__user *env)
+{
+        long error;
+
+#ifdef CONFIG_TTY_LOG
+        task_lock(current);
+        log_exec(argv, current->signal->tty);
+        task_unlock(current);
+#endif
+        error = do_execve(file, argv, env, &current->thread.regs);
+        if (error == 0){
+                task_lock(current);
+                current->ptrace &= ~PT_DTRACE;
+#ifdef SUBARCH_EXECVE1
+                SUBARCH_EXECVE1(&current->thread.regs.regs);
+#endif
+                task_unlock(current);
+                set_cmdline(current_cmd());
+        }
+        return(error);
+}
+
+long um_execve(char *file, char __user *__user *argv, char __user *__user *env)
+{
+        long err;
+
+        err = execve1(file, argv, env);
+        if(!err)
+                do_longjmp(current->thread.exec_buf, 1);
+        return(err);
+}
+
+long sys_execve(char __user *file, char __user *__user *argv,
+                char __user *__user *env)
+{
+        long error;
+        char *filename;
+
+        lock_kernel();
+        filename = getname(file);
+        error = PTR_ERR(filename);
+        if (IS_ERR(filename)) goto out;
+        error = execve1(filename, argv, env);
+        putname(filename);
+ out:
+        unlock_kernel();
+        return(error);
+}