diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 12:22:13 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 12:22:13 -0800 | 
| commit | 9977d9b379cb77e0f67bd6f4563618106e58e11d (patch) | |
| tree | 0191accfddf578edb52c69c933d64521e3dce297 /arch/x86/um/syscalls_32.c | |
| parent | cf4af01221579a4e895f43dbfc47598fbfc5a731 (diff) | |
| parent | 541880d9a2c7871f6370071d55aa6662d329c51e (diff) | |
| download | olio-linux-3.10-9977d9b379cb77e0f67bd6f4563618106e58e11d.tar.xz olio-linux-3.10-9977d9b379cb77e0f67bd6f4563618106e58e11d.zip  | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull big execve/kernel_thread/fork unification series from Al Viro:
 "All architectures are converted to new model.  Quite a bit of that
  stuff is actually shared with architecture trees; in such cases it's
  literally shared branch pulled by both, not a cherry-pick.
  A lot of ugliness and black magic is gone (-3KLoC total in this one):
   - kernel_thread()/kernel_execve()/sys_execve() redesign.
     We don't do syscalls from kernel anymore for either kernel_thread()
     or kernel_execve():
     kernel_thread() is essentially clone(2) with callback run before we
     return to userland, the callbacks either never return or do
     successful do_execve() before returning.
     kernel_execve() is a wrapper for do_execve() - it doesn't need to
     do transition to user mode anymore.
     As a result kernel_thread() and kernel_execve() are
     arch-independent now - they live in kernel/fork.c and fs/exec.c
     resp.  sys_execve() is also in fs/exec.c and it's completely
     architecture-independent.
   - daemonize() is gone, along with its parts in fs/*.c
   - struct pt_regs * is no longer passed to do_fork/copy_process/
     copy_thread/do_execve/search_binary_handler/->load_binary/do_coredump.
   - sys_fork()/sys_vfork()/sys_clone() unified; some architectures
     still need wrappers (ones with callee-saved registers not saved in
     pt_regs on syscall entry), but the main part of those suckers is in
     kernel/fork.c now."
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (113 commits)
  do_coredump(): get rid of pt_regs argument
  print_fatal_signal(): get rid of pt_regs argument
  ptrace_signal(): get rid of unused arguments
  get rid of ptrace_signal_deliver() arguments
  new helper: signal_pt_regs()
  unify default ptrace_signal_deliver
  flagday: kill pt_regs argument of do_fork()
  death to idle_regs()
  don't pass regs to copy_process()
  flagday: don't pass regs to copy_thread()
  bfin: switch to generic vfork, get rid of pointless wrappers
  xtensa: switch to generic clone()
  openrisc: switch to use of generic fork and clone
  unicore32: switch to generic clone(2)
  score: switch to generic fork/vfork/clone
  c6x: sanitize copy_thread(), get rid of clone(2) wrapper, switch to generic clone()
  take sys_fork/sys_vfork/sys_clone prototypes to linux/syscalls.h
  mn10300: switch to generic fork/vfork/clone
  h8300: switch to generic fork/vfork/clone
  tile: switch to generic clone()
  ...
Conflicts:
	arch/microblaze/include/asm/Kbuild
Diffstat (limited to 'arch/x86/um/syscalls_32.c')
| -rw-r--r-- | arch/x86/um/syscalls_32.c | 15 | 
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/x86/um/syscalls_32.c b/arch/x86/um/syscalls_32.c index db444c7218f..e8bcea99acd 100644 --- a/arch/x86/um/syscalls_32.c +++ b/arch/x86/um/syscalls_32.c @@ -6,21 +6,6 @@  #include <linux/syscalls.h>  #include <sysdep/syscalls.h> -/* - * The prototype on i386 is: - * - *     int clone(int flags, void * child_stack, int * parent_tidptr, struct user_desc * newtls - * - * and the "newtls" arg. on i386 is read by copy_thread directly from the - * register saved on the stack. - */ -long i386_clone(unsigned long clone_flags, unsigned long newsp, -		int __user *parent_tid, void *newtls, int __user *child_tid) -{ -	return sys_clone(clone_flags, newsp, parent_tid, child_tid); -} - -  long sys_sigaction(int sig, const struct old_sigaction __user *act,  			 struct old_sigaction __user *oact)  {  |