original_kernel/arch/unicore32/include/asm
Linus Torvalds 8213a2f3ee Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal
Pull pile 2 of execve and kernel_thread unification work from Al Viro:
 "Stuff in there: kernel_thread/kernel_execve/sys_execve conversions for
  several more architectures plus assorted signal fixes and cleanups.

  There'll be more (in particular, real fixes for the alpha
  do_notify_resume() irq mess)..."

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/signal: (43 commits)
  alpha: don't open-code trace_report_syscall_{enter,exit}
  Uninclude linux/freezer.h
  m32r: trim masks
  avr32: trim masks
  tile: don't bother with SIGTRAP in setup_frame
  microblaze: don't bother with SIGTRAP in setup_rt_frame()
  mn10300: don't bother with SIGTRAP in setup_frame()
  frv: no need to raise SIGTRAP in setup_frame()
  x86: get rid of duplicate code in case of CONFIG_VM86
  unicore32: remove pointless test
  h8300: trim _TIF_WORK_MASK
  parisc: decide whether to go to slow path (tracesys) based on thread flags
  parisc: don't bother looping in do_signal()
  parisc: fix double restarts
  bury the rest of TIF_IRET
  sanitize tsk_is_polling()
  bury _TIF_RESTORE_SIGMASK
  unicore32: unobfuscate _TIF_WORK_MASK
  mips: NOTIFY_RESUME is not needed in TIF masks
  mips: merge the identical "return from syscall" per-ABI code
  ...

Conflicts:
	arch/arm/include/asm/thread_info.h
2012-10-12 10:49:08 +09:00
..
Kbuild
assembler.h
barrier.h
bitops.h
bug.h
byteorder.h
cache.h
cacheflush.h
checksum.h
cmpxchg.h
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
kvm_para.h
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
ptrace.h
sigcontext.h
stacktrace.h
string.h
suspend.h
switch_to.h
thread_info.h
timex.h
tlb.h
tlbflush.h
traps.h
uaccess.h
unistd.h