[PATCH] uml: fork cleanup

Fix the do_fork calling convention: normal arch pass the regs and the new sp
value to do_fork instead of NULL.

Currently the arch-independent code ignores these values, while the UML code
(actually it's copy_thread) gets the right values by itself.

With this patch, things are fixed up.

Signed-off-by: Paolo 'Blaisorblade' Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Jeff Dike <jdike@addtoit.com>
Cc: Paolo Giarrusso <blaisorblade@yahoo.it>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 4 insertions, 19 deletions

diff --git a/arch/um/sys-i386/syscalls.c b/arch/um/sys-i386/syscalls.c
index 335e2d89504..83e9be820a8 100644
--- a/arch/um/sys-i386/syscalls.c
+++ b/arch/um/sys-i386/syscalls.c
@@ -69,15 +69,11 @@ long sys_clone(unsigned long clone_flags, unsigned long newsp,
 {
         long ret;
 
-        /* XXX: normal arch do here this pass, and also pass the regs to
-         * do_fork, instead of NULL. Currently the arch-independent code
-         * ignores these values, while the UML code (actually it's
-         * copy_thread) does the right thing. But this should change,
-         probably. */
-        /*if (!newsp)
-                newsp = UPT_SP(current->thread.regs);*/
+        if (!newsp)
+                newsp = UPT_SP(&current->thread.regs.regs);
         current->thread.forking = 1;
-        ret = do_fork(clone_flags, newsp, NULL, 0, parent_tid, child_tid);
+        ret = do_fork(clone_flags, newsp, &current->thread.regs, 0, parent_tid,
+                      child_tid);
         current->thread.forking = 0;
         return(ret);
 }
@@ -197,14 +193,3 @@ long sys_sigaction(int sig, const struct old_sigaction __user *act,
 
         return ret;
 }
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */