kevin/linux
1
Fork 0
Code
ab22541782
linux/arch/mn10300/include/asm
History
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-offsets.h
atomic.h Disintegrate asm/system.h for MN10300 2012-03-28 18:30:02 +01:00
barrier.h Disintegrate asm/system.h for MN10300 2012-03-28 18:30:02 +01:00
bitops.h asm-generic: add another generic ext2 atomic bitops 2011-07-26 16:49:46 -07:00
bug.h
bugs.h
busctl-regs.h
cache.h MN10300: Don't hard code the cacheline size in register defs 2010-10-27 17:28:39 +01:00
cacheflush.h MN10300: Allow some cacheflushes to be avoided if cache snooping is available 2010-10-27 17:28:46 +01:00
checksum.h
cmpxchg.h Disintegrate asm/system.h for MN10300 2012-03-28 18:30:02 +01:00
cpu-regs.h Fix common misspellings 2011-03-31 11:26:23 -03:00
cputime.h
current.h
debugger.h MN10300: Create generic kernel debugger hooks 2011-03-18 16:54:30 +00:00
delay.h
device.h
div64.h MN10300: gcc 4.6 vs am33 inline assembly 2011-03-23 17:42:49 +00:00
dma-mapping.h dma-mapping: remove dma_is_consistent API 2010-08-11 08:59:21 -07:00
dma.h Disintegrate asm/system.h for MN10300 2012-03-28 18:30:02 +01:00
dmactl-regs.h MN10300: Move DMA engine control reg defs to MN103E010 processor directory 2010-10-27 17:28:39 +01:00
elf.h cross-arch: don't corrupt personality flags upon exec() 2012-10-06 03:04:47 +09:00
emergency-restart.h
exceptions.h treewide: convert uses of ATTRIB_NORETURN to __noreturn 2012-01-12 20:13:03 -08:00
fb.h
fpu.h MN10300: Create generic kernel debugger hooks 2011-03-18 16:54:30 +00:00
frame.inc mn10300: switch to generic kernel_execve() 2012-10-01 00:53:59 -04:00
ftrace.h
futex.h
gdb-stub.h MN10300: Provide a MN10300_CACHE_ENABLED config option 2010-10-27 17:28:42 +01:00
hardirq.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
highmem.h highmem: kill all __kmap_atomic() 2012-03-20 21:48:30 +08:00
hw_irq.h
intctl-regs.h MN10300: Remove unused mn10300_intc_* functions 2011-03-18 16:52:51 +00:00
io.h MN10300: Use asm-generic/pci_iomap.h 2012-12-12 15:46:15 +00:00
irq_regs.h MN10300: Save frame pointer in thread_info struct rather than global var 2010-10-27 17:29:01 +01:00
irq.h MN10300: ASB2364: Handle the IRQ multiplexer in the FPGA 2010-10-27 17:28:58 +01:00
irqflags.h MN10300: Create generic kernel debugger hooks 2011-03-18 16:54:30 +00:00
Kbuild tracing,x86: Add a TSC trace_clock 2012-11-13 15:48:27 -05:00
kdebug.h
kgdb.h MN10300: Use KGDB 2011-03-18 16:54:31 +00:00
kmap_types.h
kprobes.h
linkage.h
local64.h
local.h
mc146818rtc.h
mmu_context.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
mmu.h
module.h Make most arch asm/module.h files use asm-generic/module.h 2012-09-28 14:31:03 +09:30
mutex.h
nmi.h
page_offset.h
page.h
pci.h PCI: collapse pcibios_resource_to_bus 2012-02-23 20:19:04 -07:00
percpu.h
pgalloc.h MN10300: Save frame pointer in thread_info struct rather than global var 2010-10-27 17:29:01 +01:00
pgtable.h MN10300: Map userspace atomic op regs as a vmalloc page 2010-10-27 17:28:56 +01:00
pio-regs.h
processor.h mn10300: convert to generic kernel_thread() 2012-10-01 00:54:29 -04:00
ptrace.h UAPI Disintegration 2012-10-10 2012-10-13 11:22:31 +09:00
reset-regs.h nmi watchdog: do not use cpp symbol in Kconfig 2012-03-23 16:58:31 -07:00
rtc-regs.h
rtc.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
rwlock.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
scatterlist.h
sections.h
serial-regs.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
serial.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
setup.h UAPI: (Scripted) Disintegrate arch/mn10300/include/asm 2012-10-10 12:10:10 +01:00
shmparam.h
signal.h unify default ptrace_signal_deliver 2012-11-29 00:01:23 -05:00
smp.h MN10300: Use KGDB 2011-03-18 16:54:31 +00:00
smsc911x.h MN10300: ASB2364: Add support for SMSC911X and SMC911X 2010-10-27 17:28:58 +01:00
spinlock_types.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
spinlock.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
string.h
switch_to.h Disintegrate asm/system.h for MN10300 2012-03-28 18:30:02 +01:00
syscall.h MN10300: Implement asm/syscall.h 2010-12-03 09:18:53 -08:00
termios.h UAPI: (Scripted) Disintegrate arch/mn10300/include/asm 2012-10-10 12:10:10 +01:00
thread_info.h sanitize tsk_is_polling() 2012-10-01 09:58:13 -04:00
timer-regs.h MN10300: And Panasonic AM34 subarch and implement SMP 2010-10-27 17:28:55 +01:00
timex.h mn10300: move setup_jiffies_interrupt() to cevt-mn10300.c 2012-07-11 16:04:41 -07:00
tlb.h
tlbflush.h MN10300: SMP TLB flushing 2010-10-27 17:28:51 +01:00
topology.h
types.h UAPI: (Scripted) Disintegrate arch/mn10300/include/asm 2012-10-10 12:10:10 +01:00
uaccess.h MN10300: asm/uaccess.h needs to #include linux/kernel.h for might_sleep() 2011-06-21 18:31:44 -07:00
ucontext.h
unaligned.h
unistd.h Bury the conditionals from kernel_thread/kernel_execve series 2012-12-19 18:07:38 -05:00
user.h
vga.h
xor.h