Merge branch 'torvalds/master'

[firefly-linux-kernel-4.4.55.git] / arch / um / kernel / skas / process.c

diff --git a/arch/um/kernel/skas/process.c b/arch/um/kernel/skas/process.c
index 4da11b3c8ddbc31af5b4a360f487769d84fcf60a..527fa5881915cea2d5c78a847b804ca7f4459597 100644 (file)
--- a/arch/um/kernel/skas/process.c
+++ b/arch/um/kernel/skas/process.c
@@ -10,25 +10,6 @@
 #include <os.h>
 #include <skas.h>
 
-int new_mm(unsigned long stack)
-{
-       int fd, err;
-
-       fd = os_open_file("/proc/mm", of_cloexec(of_write(OPENFLAGS())), 0);
-       if (fd < 0)
-               return fd;
-
-       if (skas_needs_stub) {
-               err = map_stub_pages(fd, STUB_CODE, STUB_DATA, stack);
-               if (err) {
-                       os_close_file(fd);
-                       return err;
-               }
-       }
-
-       return fd;
-}
-
 extern void start_kernel(void);
 
 static int __init start_kernel_proc(void *unused)
@@ -40,9 +21,7 @@ static int __init start_kernel_proc(void *unused)
 
        cpu_tasks[0].pid = pid;
        cpu_tasks[0].task = current;
-#ifdef CONFIG_SMP
-       init_cpu_online(get_cpu_mask(0));
-#endif
+
        start_kernel();
        return 0;
 }
@@ -55,14 +34,6 @@ int __init start_uml(void)
 {
        stack_protections((unsigned long) &cpu0_irqstack);
        set_sigstack(cpu0_irqstack, THREAD_SIZE);
-       if (proc_mm) {
-               userspace_pid[0] = start_userspace(0);
-               if (userspace_pid[0] < 0) {
-                       printf("start_uml - start_userspace returned %d\n",
-                              userspace_pid[0]);
-                       exit(1);
-               }
-       }
 
        init_new_thread_signals();