linux/arch/score/include/uapi/asm
Linus Torvalds 54d46ea993 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull signal handling cleanups from Al Viro:
 "sigaltstack infrastructure + conversion for x86, alpha and um,
  COMPAT_SYSCALL_DEFINE infrastructure.

  Note that there are several conflicts between "unify
  SS_ONSTACK/SS_DISABLE definitions" and UAPI patches in mainline;
  resolution is trivial - just remove definitions of SS_ONSTACK and
  SS_DISABLED from arch/*/uapi/asm/signal.h; they are all identical and
  include/uapi/linux/signal.h contains the unified variant."

Fixed up conflicts as per Al.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal:
  alpha: switch to generic sigaltstack
  new helpers: __save_altstack/__compat_save_altstack, switch x86 and um to those
  generic compat_sys_sigaltstack()
  introduce generic sys_sigaltstack(), switch x86 and um to it
  new helper: compat_user_stack_pointer()
  new helper: restore_altstack()
  unify SS_ONSTACK/SS_DISABLE definitions
  new helper: current_user_stack_pointer()
  missing user_stack_pointer() instances
  Bury the conditionals from kernel_thread/kernel_execve series
  COMPAT_SYSCALL_DEFINE: infrastructure
2012-12-20 18:05:28 -08:00
..
Kbuild UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
auxvec.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
bitsperlong.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
byteorder.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
errno.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
fcntl.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
ioctl.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
ioctls.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
ipcbuf.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
kvm_para.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
mman.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
msgbuf.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
param.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
poll.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
posix_types.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
ptrace.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
resource.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
sembuf.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
setup.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
shmbuf.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
sigcontext.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
siginfo.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
signal.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
socket.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
sockios.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
stat.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
statfs.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
swab.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
termbits.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
termios.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
types.h UAPI: (Scripted) Disintegrate arch/score/include/asm 2012-12-20 10:55:33 +00:00
unistd.h Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-20 18:05:28 -08:00