Merge branch 'for-linus' of master.kernel.org:/pub/scm/linux/kernel/git/roland/infiniband

[powerpc.git] / arch / um / kernel / skas / clone.c

diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index 4dc55f1..47b812b 100644 (file)
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -9,18 +9,23 @@
 #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
  * 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.
  */
+
 void __attribute__ ((__section__ (".__syscall_stub")))
 stub_clone_handler(void)
 {
+       struct stub_data *data = (struct stub_data *) UML_CONFIG_STUB_DATA;
        long err;
-       struct stub_data *from = (struct stub_data *) UML_CONFIG_STUB_DATA;
 
        err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
-                           UML_CONFIG_STUB_DATA + PAGE_SIZE / 2 -
+                           UML_CONFIG_STUB_DATA + UM_KERN_PAGE_SIZE / 2 -
                            sizeof(void *));
        if(err != 0)
                goto out;
@@ -29,16 +34,21 @@ stub_clone_handler(void)
        if(err)
                goto out;
 
-       err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
-                           (long) &from->timer, 0);
+       err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, 
+                           (long) &data->timer, 0);
        if(err)
                goto out;
 
-       err = stub_syscall6(STUB_MMAP_NR, UML_CONFIG_STUB_DATA, PAGE_SIZE,
-                           PROT_READ | PROT_WRITE, MAP_FIXED | MAP_SHARED,
-                           from->fd, from->offset);
+       remap_stack(data->fd, data->offset);
+       goto done;
+
  out:
-       /* save current result. Parent: pid; child: retcode of mmap */
-       from->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();
 }