mn10300: switch to generic fork/vfork/clone

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

2 files changed, 8 insertions, 28 deletions

diff --git a/arch/mn10300/include/asm/unistd.h b/arch/mn10300/include/asm/unistd.h
index 9711d51b0212..cabf8ba73b27 100644
--- a/arch/mn10300/include/asm/unistd.h
+++ b/arch/mn10300/include/asm/unistd.h
@@ -44,6 +44,9 @@
 #define __ARCH_WANT_SYS_RT_SIGACTION
 #define __ARCH_WANT_SYS_RT_SIGSUSPEND
 #define __ARCH_WANT_SYS_EXECVE
+#define __ARCH_WANT_SYS_FORK
+#define __ARCH_WANT_SYS_VFORK
+#define __ARCH_WANT_SYS_CLONE
 
 /*
  * "Conditional" syscalls
diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index d0c671b6d9ff..5e0ef396458d 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -206,7 +206,7 @@ int arch_dup_task_struct(struct task_struct *dst, struct task_struct *src)
  */
 int copy_thread(unsigned long clone_flags,
                 unsigned long c_usp, unsigned long ustk_size,
-                struct task_struct *p, struct pt_regs *kregs)
+                struct task_struct *p, struct pt_regs *unused)
 {
         struct thread_info *ti = task_thread_info(p);
         struct pt_regs *c_regs;
@@ -227,7 +227,7 @@ int copy_thread(unsigned long clone_flags,
         p->thread.wchan = p->thread.pc;
         p->thread.usp   = c_usp;
 
-        if (unlikely(!kregs)) {
+        if (unlikely(p->flags & PF_KTHREAD)) {
                 memset(c_regs, 0, sizeof(struct pt_regs));
                 c_regs->a0 = c_usp; /* function */
                 c_regs->d0 = ustk_size; /* argument */
@@ -236,8 +236,9 @@ int copy_thread(unsigned long clone_flags,
                 p->thread.pc    = (unsigned long) ret_from_kernel_thread;
                 return 0;
         }
-        *c_regs = *kregs;
-        c_regs->sp = c_usp;
+        *c_regs = *current_pt_regs();
+        if (c_usp)
+                c_regs->sp = c_usp;
         c_regs->epsw &= ~EPSW_FE; /* my FPU */
 
         /* the new TLS pointer is passed in as arg #5 to sys_clone() */
@@ -249,30 +250,6 @@ int copy_thread(unsigned long clone_flags,
         return 0;
 }
 
-/*
- * clone a process
- * - tlsptr is retrieved by copy_thread() from current_frame()->d3
- */
-asmlinkage long sys_clone(unsigned long clone_flags, unsigned long newsp,
-                          int __user *parent_tidptr, int __user *child_tidptr,
-                          int __user *tlsptr)
-{
-        return do_fork(clone_flags, newsp ?: current_frame()->sp,
-                       current_frame(), 0, parent_tidptr, child_tidptr);
-}
-
-asmlinkage long sys_fork(void)
-{
-        return do_fork(SIGCHLD, current_frame()->sp,
-                       current_frame(), 0, NULL, NULL);
-}
-
-asmlinkage long sys_vfork(void)
-{
-        return do_fork(CLONE_VFORK | CLONE_VM | SIGCHLD, current_frame()->sp,
-                       current_frame(), 0, NULL, NULL);
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
         return p->thread.wchan;