OpenCloudOS-Kernel/arch/sh/include
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
..
asm Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal 2012-12-20 18:05:28 -08:00
cpu-common/cpu sh: Kill off unused cpu/cacheflush.h. 2009-08-21 16:20:57 +09:00
cpu-sh2/cpu sh: Tidy up some of the cpu legacy dma header mess. 2012-05-19 18:30:31 +09:00
cpu-sh2a/cpu sh: sh7269: Fix LCD pinmux 2012-08-09 13:16:55 +09:00
cpu-sh3/cpu sh: Tidy up some of the cpu legacy dma header mess. 2012-05-19 18:30:31 +09:00
cpu-sh4/cpu sh: modify the sh_dmae_slave_config for RSPI in setup-sh7757 2012-07-26 14:16:09 +09:00
cpu-sh4a/cpu sh: dma: More legacy cpu dma chainsawing. 2012-05-19 20:38:50 +09:00
cpu-sh5/cpu sh: Tidy up some of the cpu legacy dma header mess. 2012-05-19 18:30:31 +09:00
mach-common/mach sh: legacy PCI evt2irq migration. 2012-05-18 17:42:29 +09:00
mach-dreamcast/mach sh: Kill off MAX_DMA_ADDRESS leftovers. 2012-05-19 18:50:09 +09:00
mach-ecovec24/mach UAPI: (Scripted) Convert #include "..." to #include <path/...> in kernel system headers 2012-10-02 18:01:25 +01:00
mach-kfr2r09/mach sh: kfr2r09: Use the backlight API for brightness control 2012-11-21 15:50:02 +01:00
mach-landisk/mach sh: landisk evt2irq migration. 2012-05-18 16:51:36 +09:00
mach-migor/mach fbdev: sh_mobile_lcdc: Remove board configuration board_data field 2012-03-12 22:40:49 +01:00
mach-sdk7786/mach sh: mach-sdk7786: Handle baseboard NMI source selection. 2010-12-17 18:58:04 +09:00
mach-se/mach Merge branch 'sh/dynamic-irq-cleanup' into sh-latest 2012-06-13 12:12:41 +09:00
mach-sh03/mach
mach-x3proto/mach sh: mach-x3proto: Support for baseboard GPIOs. 2010-10-04 02:59:29 +09:00
uapi/asm tty, ioctls -- Add new ioctl definitions for tty flags fetching 2012-10-25 12:07:18 -07:00