linux/arch/um/include/asm
Linus Torvalds 5129df03d0 Merge branch 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu
* 'for-2.6.40' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/percpu:
  percpu: Unify input section names
  percpu: Avoid extra NOP in percpu_cmpxchg16b_double
  percpu: Cast away printk format warning
  percpu: Always align percpu output section to PAGE_SIZE

Fix up fairly trivial conflict in arch/x86/include/asm/percpu.h as per Tejun
2011-05-24 11:53:42 -07:00
..
a.out-core.h
apic.h
arch_hweight.h um, hweight: Fix UML boot crash due to x86 optimized hweight 2010-06-10 15:24:30 -07:00
asm-offsets.h kbuild: move asm-offsets.h to include/generated 2009-12-12 13:08:14 +01:00
auxvec.h
bug.h um: fix call tracer and bug handler 2011-04-14 16:06:56 -07:00
bugs.h
cache.h
checksum.h
common.lds.S percpu: Always align percpu output section to PAGE_SIZE 2011-03-24 18:50:09 +01:00
cputime.h
current.h
delay.h
desc.h
device.h
dma.h
emergency-restart.h
fixmap.h x86, um: get rid of uml highmem.h 2008-10-22 22:55:21 -07:00
ftrace.h tracing: make CALLER_ADDRx overwriteable 2009-03-02 16:49:37 -05:00
futex.h
hardirq.h um: convert to asm-generic/hardirq.h 2009-09-22 07:17:45 -07:00
hw_irq.h
io.h
irq_regs.h
irq_vectors.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
irq.h
irqflags.h
kdebug.h
kmap_types.h
mmu_context.h cpumask: use mm_cpumask() wrapper: um 2009-09-24 09:34:51 +09:30
mmu.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
mutex.h
page_offset.h
page.h asm-generic: rename page.h and uaccess.h 2009-06-11 21:02:17 +02:00
param.h
pci.h PCI: remove pcibios_scan_all_fns() 2009-09-09 13:29:18 -07:00
pda.h uml: remove useless comments 2009-04-01 08:59:17 -07:00
pgalloc.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
pgtable-2level.h
pgtable-3level.h um, x86: Cast to (u64 *) inside set_64bit() 2010-08-03 07:00:16 -07:00
pgtable.h mm: remove pte_*map_nested() 2010-10-26 16:52:08 -07:00
processor-generic.h mm: NUMA aware alloc_task_struct_node() 2011-03-22 17:44:01 -07:00
ptrace-generic.h um: fix ptrace build error 2010-11-12 07:55:30 -08:00
required-features.h
sections.h
segment.h
setup.h
smp.h
system.h um: fix IRQ flag handling naming 2010-10-26 16:52:05 -07:00
thread_info.h um: adjust current_thread_info() for newer gcc versions 2011-04-28 11:28:21 -07:00
timex.h
tlb.h mm: Pass virtual address to [__]p{te,ud,md}_free_tlb() 2009-07-27 12:10:38 -07:00
tlbflush.h
topology.h
uaccess.h
xor.h