alistair23-linux/arch/unicore32/include/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
..
assembler.h
barrier.h
bitops.h
bug.h UniCore32-bugfix: Remove definitions in asm/bug.h to solve difference between native and cross compiler 2012-11-09 17:30:09 +08:00
cache.h
cacheflush.h
checksum.h
cmpxchg.h UniCore32-bugfix: fix mismatch return value of __xchg_bad_pointer 2012-11-09 17:30:09 +08:00
cpu-single.h
cputype.h
delay.h
dma-mapping.h
dma.h
elf.h
fpstate.h
fpu-ucf64.h
gpio.h
hwcap.h
hwdef-copro.h
io.h
irq.h
irqflags.h
Kbuild Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace into perf/core 2012-12-08 15:54:35 +01:00
linkage.h
memblock.h
memory.h
mmu.h
mmu_context.h
mutex.h
page.h
pci.h
pgalloc.h
pgtable-hwdef.h
pgtable.h
processor.h unicore32: switch to generic kernel_thread()/kernel_execve() 2012-11-09 17:30:09 +08:00
ptrace.h missing user_stack_pointer() instances 2012-12-19 18:07:39 -05:00
stacktrace.h
string.h
suspend.h
switch_to.h
thread_info.h bury _TIF_RESTORE_SIGMASK 2012-10-01 09:58:12 -04:00
timex.h
tlb.h
tlbflush.h
traps.h
uaccess.h