Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal

Pull pile 2 of execve and kernel_thread unification work from Al Viro:
 "Stuff in there: kernel_thread/kernel_execve/sys_execve conversions for
  several more architectures plus assorted signal fixes and cleanups.

  There'll be more (in particular, real fixes for the alpha
  do_notify_resume() irq mess)..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (43 commits)
  alpha: don't open-code trace_report_syscall_{enter,exit}
  Uninclude linux/freezer.h
  m32r: trim masks
  avr32: trim masks
  tile: don't bother with SIGTRAP in setup_frame
  microblaze: don't bother with SIGTRAP in setup_rt_frame()
  mn10300: don't bother with SIGTRAP in setup_frame()
  frv: no need to raise SIGTRAP in setup_frame()
  x86: get rid of duplicate code in case of CONFIG_VM86
  unicore32: remove pointless test
  h8300: trim _TIF_WORK_MASK
  parisc: decide whether to go to slow path (tracesys) based on thread flags
  parisc: don't bother looping in do_signal()
  parisc: fix double restarts
  bury the rest of TIF_IRET
  sanitize tsk_is_polling()
  bury _TIF_RESTORE_SIGMASK
  unicore32: unobfuscate _TIF_WORK_MASK
  mips: NOTIFY_RESUME is not needed in TIF masks
  mips: merge the identical "return from syscall" per-ABI code
  ...

Conflicts:
	arch/arm/include/asm/thread_info.h

1 files changed, 23 insertions, 68 deletions

diff --git a/arch/mn10300/kernel/process.c b/arch/mn10300/kernel/process.c
index e9cceba193b6..d0c671b6d9ff 100644
--- a/arch/mn10300/kernel/process.c
+++ b/arch/mn10300/kernel/process.c
@@ -165,27 +165,6 @@ void show_regs(struct pt_regs *regs)
 }
 
 /*
- * create a kernel thread
- */
-int kernel_thread(int (*fn)(void *), void *arg, unsigned long flags)
-{
-        struct pt_regs regs;
-
-        memset(&regs, 0, sizeof(regs));
-
-        regs.a2 = (unsigned long) fn;
-        regs.d2 = (unsigned long) arg;
-        regs.pc = (unsigned long) kernel_thread_helper;
-        local_save_flags(regs.epsw);
-        regs.epsw |= EPSW_IE | EPSW_IM_7;
-
-        /* Ok, create the new process.. */
-        return do_fork(flags | CLONE_VM | CLONE_UNTRACED, 0, &regs, 0,
-                       NULL, NULL);
-}
-EXPORT_SYMBOL(kernel_thread);
-
-/*
  * free current thread data structures etc..
  */
 void exit_thread(void)
@@ -230,50 +209,42 @@ int copy_thread(unsigned long clone_flags,
                 struct task_struct *p, struct pt_regs *kregs)
 {
         struct thread_info *ti = task_thread_info(p);
-        struct pt_regs *c_uregs, *c_kregs, *uregs;
+        struct pt_regs *c_regs;
         unsigned long c_ksp;
 
-        uregs = current->thread.uregs;
-
         c_ksp = (unsigned long) task_stack_page(p) + THREAD_SIZE;
 
         /* allocate the userspace exception frame and set it up */
         c_ksp -= sizeof(struct pt_regs);
-        c_uregs = (struct pt_regs *) c_ksp;
+        c_regs = (struct pt_regs *) c_ksp;
+        c_ksp -= 12; /* allocate function call ABI slack */
 
-        p->thread.uregs = c_uregs;
-        *c_uregs = *uregs;
-        c_uregs->sp = c_usp;
-        c_uregs->epsw &= ~EPSW_FE; /* my FPU */
+        /* set up things up so the scheduler can start the new task */
+        p->thread.uregs = c_regs;
+        ti->frame       = c_regs;
+        p->thread.a3    = (unsigned long) c_regs;
+        p->thread.sp    = c_ksp;
+        p->thread.wchan = p->thread.pc;
+        p->thread.usp   = c_usp;
 
-        c_ksp -= 12; /* allocate function call ABI slack */
+        if (unlikely(!kregs)) {
+                memset(c_regs, 0, sizeof(struct pt_regs));
+                c_regs->a0 = c_usp; /* function */
+                c_regs->d0 = ustk_size; /* argument */
+                local_save_flags(c_regs->epsw);
+                c_regs->epsw |= EPSW_IE | EPSW_IM_7;
+                p->thread.pc    = (unsigned long) ret_from_kernel_thread;
+                return 0;
+        }
+        *c_regs = *kregs;
+        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() */
         if (clone_flags & CLONE_SETTLS)
-                c_uregs->e2 = current_frame()->d3;
-
-        /* set up the return kernel frame if called from kernel_thread() */
-        c_kregs = c_uregs;
-        if (kregs != uregs) {
-                c_ksp -= sizeof(struct pt_regs);
-                c_kregs = (struct pt_regs *) c_ksp;
-                *c_kregs = *kregs;
-                c_kregs->sp = c_usp;
-                c_kregs->next = c_uregs;
-#ifdef CONFIG_MN10300_CURRENT_IN_E2
-                c_kregs->e2 = (unsigned long) p; /* current */
-#endif
-
-                c_ksp -= 12; /* allocate function call ABI slack */
-        }
+                c_regs->e2 = current_frame()->d3;
 
-        /* set up things up so the scheduler can start the new task */
-        ti->frame       = c_kregs;
-        p->thread.a3    = (unsigned long) c_kregs;
-        p->thread.sp    = c_ksp;
         p->thread.pc    = (unsigned long) ret_from_fork;
-        p->thread.wchan = (unsigned long) ret_from_fork;
-        p->thread.usp   = c_usp;
 
         return 0;
 }
@@ -302,22 +273,6 @@ asmlinkage long sys_vfork(void)
                        current_frame(), 0, NULL, NULL);
 }
 
-asmlinkage long sys_execve(const char __user *name,
-                           const char __user *const __user *argv,
-                           const char __user *const __user *envp)
-{
-        char *filename;
-        int error;
-
-        filename = getname(name);
-        error = PTR_ERR(filename);
-        if (IS_ERR(filename))
-                return error;
-        error = do_execve(filename, argv, envp, current_frame());
-        putname(filename);
-        return error;
-}
-
 unsigned long get_wchan(struct task_struct *p)
 {
         return p->thread.wchan;