kernel_optimize_test/arch/sparc/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
..
apc.h
asi.h
auxvec.h
bitsperlong.h
byteorder.h
display7seg.h
envctrl.h
errno.h
fbio.h
fcntl.h
ioctl.h
ioctls.h tty, ioctls -- Add new ioctl definitions for tty flags fetching 2012-10-25 12:07:18 -07:00
ipcbuf.h
jsflash.h
Kbuild
kvm_para.h
mman.h
msgbuf.h
openpromio.h
param.h
perfctr.h
poll.h
posix_types.h
psr.h
psrcompat.h
pstate.h
ptrace.h
resource.h
sembuf.h
setup.h
shmbuf.h
sigcontext.h UAPI: Make arch/sparc/include/uapi/asm/sigcontext.h non-empty 2012-10-17 12:32:35 +01:00
siginfo.h
signal.h unify SS_ONSTACK/SS_DISABLE definitions 2012-12-19 18:07:39 -05:00
socket.h sk-filter: Add ability to get socket filter program (v2) 2012-11-01 11:17:15 -04:00
sockios.h
stat.h
statfs.h
swab.h
termbits.h
termios.h
traps.h
types.h
uctx.h
unistd.h sparc: Wire up sys_kcmp. 2012-10-28 13:15:09 -07:00
utrap.h
watchdog.h