original_kernel/arch/cris/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
..
Kbuild UAPI Disintegration 2012-10-09 2012-12-20 12:48:53 +01:00
asm-offsets.h
atomic.h
axisflashmap.h
barrier.h
bitops.h
bug.h
bugs.h
cache.h
cacheflush.h
checksum.h
cmpxchg.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h
dma.h
elf.h
emergency-restart.h
eshlibld.h
etraxi2c.h
fasttimer.h
fb.h
ftrace.h
futex.h
hardirq.h
hw_irq.h
io.h CRIS: fix I/O macros 2012-12-18 15:02:11 -08:00
irq.h
irq_regs.h
irqflags.h
kdebug.h
kmap_types.h
linkage.h
local.h
local64.h
mmu.h
mmu_context.h
mutex.h
page.h
pci.h
percpu.h
pgalloc.h
pgtable.h
processor.h
ptrace.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
scatterlist.h
sections.h
segment.h
serial.h
shmparam.h
signal.h UAPI Disintegration 2012-10-09 2012-12-20 12:48:53 +01:00
smp.h
spinlock.h
string.h
swab.h
switch_to.h
termios.h
thread_info.h
timex.h
tlb.h
tlbflush.h
topology.h
types.h
uaccess.h
ucontext.h
unaligned.h
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
user.h