Merge branches 'release' and 'throttling-domains' into release

[linux-2.6] / arch / um / kernel / skas / clone.c

diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index cb37ce9124a6f4a01702f260cab102f8a332b017..2c8583c1a344df2003ee0f2371ca6ead0a085982 100644 (file)
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -1,51 +1,57 @@
-#include <sched.h>
+/*
+ * Copyright (C) 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
+ * Licensed under the GPL
+ */
+
 #include <signal.h>
-#include <sys/mman.h>
-#include <sys/time.h>
+#include <sched.h>
 #include <asm/unistd.h>
-#include <asm/page.h>
+#include <sys/time.h>
+#include "as-layout.h"
+#include "kern_constants.h"
 #include "ptrace_user.h"
-#include "skas.h"
 #include "stub-data.h"
-#include "uml-config.h"
 #include "sysdep/stub.h"
-#include "kern_constants.h"
 
-/* This is in a separate file because it needs to be compiled with any
+/*
+ * This is in a separate file because it needs to be compiled with any
  * extraneous gcc flags (-pg, -fprofile-arcs, -ftest-coverage) disabled
  *
  * Use UM_KERN_PAGE_SIZE instead of PAGE_SIZE because that calls getpagesize
  * on some systems.
  */
 
-#define STUB_DATA(field) (((struct stub_data *) UML_CONFIG_STUB_DATA)->field)
-
 void __attribute__ ((__section__ (".__syscall_stub")))
 stub_clone_handler(void)
 {
+       struct stub_data *data = (struct stub_data *) STUB_DATA;
        long err;
 
        err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
-                           UML_CONFIG_STUB_DATA + UM_KERN_PAGE_SIZE / 2 -
-                           sizeof(void *));
-       if(err != 0)
+                           STUB_DATA + UM_KERN_PAGE_SIZE / 2 - sizeof(void *));
+       if (err != 0)
                goto out;
 
        err = stub_syscall4(__NR_ptrace, PTRACE_TRACEME, 0, 0, 0);
-       if(err)
+       if (err)
                goto out;
 
        err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
-                           (long) &STUB_DATA(timer), 0);
-       if(err)
+                           (long) &data->timer, 0);
+       if (err)
                goto out;
 
-       err = stub_syscall6(STUB_MMAP_NR, UML_CONFIG_STUB_DATA,
-                           UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
-                           MAP_FIXED | MAP_SHARED, STUB_DATA(fd),
-                           STUB_DATA(offset));
+       remap_stack(data->fd, data->offset);
+       goto done;
+
  out:
-       /* save current result. Parent: pid; child: retcode of mmap */
-       STUB_DATA(err) = err;
+       /*
+        * save current result.
+        * Parent: pid;
+        * child: retcode of mmap already saved and it jumps around this
+        * assignment
+        */
+       data->err = err;
+ done:
        trap_myself();
 }