diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 10:05:52 +0900 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-10-13 10:05:52 +0900 | 
| commit | 4e21fc138bfd7fe625ff5dc81541399aaf9d429b (patch) | |
| tree | 43bedf14d2eee7711b8241dcfd6bd7b8737d9bd5 /arch/um/kernel/exec.c | |
| parent | 8418263e3547ed3816475e4c55a77004f0426ee6 (diff) | |
| parent | 5522be6a4624a5f505555569e4d9cee946630686 (diff) | |
| download | olio-linux-3.10-4e21fc138bfd7fe625ff5dc81541399aaf9d429b.tar.xz olio-linux-3.10-4e21fc138bfd7fe625ff5dc81541399aaf9d429b.zip  | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull third pile of kernel_execve() patches from Al Viro:
 "The last bits of infrastructure for kernel_thread() et.al., with
  alpha/arm/x86 use of those.  Plus sanitizing the asm glue and
  do_notify_resume() on alpha, fixing the "disabled irq while running
  task_work stuff" breakage there.
  At that point the rest of kernel_thread/kernel_execve/sys_execve work
  can be done independently for different architectures.  The only
  pending bits that do depend on having all architectures converted are
  restrictred to fs/* and kernel/* - that'll obviously have to wait for
  the next cycle.
  I thought we'd have to wait for all of them done before we start
  eliminating the longjump-style insanity in kernel_execve(), but it
  turned out there's a very simple way to do that without flagday-style
  changes."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  alpha: switch to saner kernel_execve() semantics
  arm: switch to saner kernel_execve() semantics
  x86, um: convert to saner kernel_execve() semantics
  infrastructure for saner ret_from_kernel_thread semantics
  make sure that kernel_thread() callbacks call do_exit() themselves
  make sure that we always have a return path from kernel_execve()
  ppc: eeh_event should just use kthread_run()
  don't bother with kernel_thread/kernel_execve for launching linuxrc
  alpha: get rid of switch_stack argument of do_work_pending()
  alpha: don't bother passing switch_stack separately from regs
  alpha: take SIGPENDING/NOTIFY_RESUME loop into signal.c
  alpha: simplify TIF_NEED_RESCHED handling
Diffstat (limited to 'arch/um/kernel/exec.c')
| -rw-r--r-- | arch/um/kernel/exec.c | 5 | 
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/um/kernel/exec.c b/arch/um/kernel/exec.c index ab019c7f0b5..3a8ece7d09c 100644 --- a/arch/um/kernel/exec.c +++ b/arch/um/kernel/exec.c @@ -47,8 +47,3 @@ void start_thread(struct pt_regs *regs, unsigned long eip, unsigned long esp)  #endif  }  EXPORT_SYMBOL(start_thread); - -void __noreturn ret_from_kernel_execve(struct pt_regs *unused) -{ -	UML_LONGJMP(current->thread.exec_buf, 1); -}  |