linux_dsm_epyc7002/arch/arm/include/asm
Linus Torvalds ca41cc96b2 Merge branch 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull CMA and DMA-mapping updates from Marek Szyprowski:
 "This time the pull request is rather small, because the further
  redesign patches were not ready on time.

  This pull request consists of the patches which extend ARM DMA-mapping
  subsystem with support for CPU coherent (ACP) DMA busses.  The first
  client of the new version is HighBank SATA driver.  The second part of
  the pull request includes various cleanup for both CMA common code and
  ARM DMA-mapping subsystem."

Fix up trivial add-add conflict due to the "dma-coherent" DT property
being added next to the "calxeda,port-phys" property for the Calxeda
AHCI controller.

* 'for-v3.7' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  ARM: dma-mapping: Remove unsed var at arm_coherent_iommu_unmap_page
  ARM: highbank: add coherent DMA setup
  ARM: kill off arch_is_coherent
  ARM: add coherent iommu dma ops
  ARM: add coherent dma ops
  ARM: dma-mapping: Refrain noisy console message
  ARM: dma-mapping: Small logical clean up
  drivers: dma-contiguous: refactor dma_alloc_from_contiguous()
2012-10-02 19:13:12 -07:00
..
hardware ARM: soc: device tree updates 2012-10-01 18:28:06 -07:00
mach Merge branch 'multiplatform/smp_ops' into next/multiplatform 2012-09-22 00:16:04 -07:00
a.out-core.h
a.out.h
arch_timer.h ARM: 7451/1: arch timer: implement read_current_timer and get_cycles 2012-07-09 17:42:23 +01:00
asm-offsets.h
assembler.h ARM: 7527/1: uaccess: explicitly check __user pointer when !CPU_USE_DOMAINS 2012-09-09 17:28:47 +01:00
atomic.h ARM: fix warnings about atomic64_read 2012-07-05 13:06:32 +01:00
barrier.h ARM: kill off arch_is_coherent 2012-10-02 08:58:07 +02:00
bitops.h
bug.h
bugs.h
byteorder.h
cache.h
cacheflush.h ARM: 7479/1: mm: avoid NULL dereference when flushing gate_vma with VIVT caches 2012-07-31 12:04:47 +01:00
cachetype.h
checksum.h
clkdev.h
cmpxchg.h
compiler.h
cp15.h
cpu.h
cpuidle.h
cputype.h
cti.h
current.h
delay.h ARM: 7452/1: delay: allow timer-based delay implementation to be selected 2012-07-09 17:42:23 +01:00
device.h
div64.h
dma-contiguous.h
dma-iommu.h
dma-mapping.h ARM: add coherent dma ops 2012-10-02 08:58:06 +02:00
dma.h
domain.h ARM: fix set_domain() macro 2012-07-05 09:50:55 +01:00
ecard.h
edac.h
elf.h
entry-macro-multi.S
exception.h
exec.h
fb.h
fcntl.h
fiq.h
fixmap.h
flat.h
floppy.h
fncpy.h
fpstate.h
ftrace.h
futex.h ARM: 7425/1: extable: ensure fixup entries are 4-byte aligned 2012-06-16 16:30:25 +01:00
glue-cache.h
glue-df.h
glue-pf.h
glue-proc.h
glue.h
gpio.h ARM: make mach/gpio.h headers optional 2012-09-14 09:21:59 -05:00
hardirq.h
highmem.h
hw_breakpoint.h
hw_irq.h
hwcap.h
ide.h
idmap.h
io.h ARM: Add fixed PCI i/o mapping 2012-07-25 09:26:42 -05:00
ioctls.h
ipcbuf.h
irq.h
irqflags.h
jump_label.h
Kbuild
kexec.h
kgdb.h
kmap_types.h arm: remove km_type definitions 2012-07-24 15:27:28 +08:00
kprobes.h
kvm_para.h
limits.h
linkage.h
localtimer.h
mach-types.h
mc146818rtc.h
memblock.h
memory.h ARM: kill off arch_is_coherent 2012-10-02 08:58:07 +02:00
mman.h
mmu_context.h
mmu.h
module.h
msgbuf.h
mtd-xip.h
mutex.h ARM: 7467/1: mutex: use generic xchg-based implementation for ARMv6+ 2012-07-31 10:30:41 +01:00
nwflash.h
opcodes.h
outercache.h
page-nommu.h
page.h
param.h
parport.h
pci.h
perf_event.h ARM: perf: prepare for moving CPU PMU code into separate file 2012-08-23 11:35:52 +01:00
pgalloc.h
pgtable-2level-hwdef.h
pgtable-2level-types.h
pgtable-2level.h
pgtable-3level-hwdef.h
pgtable-3level-types.h
pgtable-3level.h
pgtable-hwdef.h
pgtable-nommu.h
pgtable.h ARM: 7488/1: mm: use 5 bits for swapfile type encoding 2012-08-11 09:15:59 +01:00
pmu.h ARM: perf: move irq registration into pmu implementation 2012-08-23 11:35:52 +01:00
posix_types.h bury __kernel_nlink_t, make internal nlink_t consistent 2012-05-30 21:04:50 -04:00
proc-fns.h
processor.h Merge branch 'x86-fpu-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 2012-05-23 10:59:07 -07:00
procinfo.h
prom.h
ptrace.h
scatterlist.h
sched_clock.h ARM: 7486/1: sched_clock: update epoch_cyc on resume 2012-08-11 09:15:58 +01:00
seccomp.h
segment.h
sembuf.h
serial.h
setup.h ARM: 7465/1: Handle >4GB memory sizes in device tree and mem=size@start option 2012-07-29 22:19:14 +01:00
shmbuf.h
shmparam.h
sigcontext.h
signal.h
smp_plat.h
smp_scu.h
smp_twd.h
smp.h ARM: consolidate pen_release instead of having per platform definitions 2012-09-14 11:15:01 +02:00
socket.h
sockios.h
sparsemem.h
spinlock_types.h ARM: 7446/1: spinlock: use ticket algorithm for ARMv6+ locking implementation 2012-07-09 17:41:10 +01:00
spinlock.h ARM: 7447/1: rwlocks: remove unused branch labels from trylock routines 2012-07-09 17:41:10 +01:00
stackprotector.h
stacktrace.h
stat.h
statfs.h
string.h
suspend.h
swab.h
switch_to.h
syscall.h
system_info.h
system_misc.h
system.h
tcm.h
termbits.h
termios.h
therm.h
thread_info.h ARM: 7443/1: Revert "new way of handling ERESTART_RESTARTBLOCK" 2012-07-05 09:50:56 +01:00
thread_notify.h
timex.h ARM: initial multiplatform support 2012-09-14 09:22:06 -05:00
tlb.h ARM: 7503/1: mm: only flush both pmd entries for classic MMU 2012-08-25 09:15:57 +01:00
tlbflush.h
tls.h
topology.h
traps.h
types.h
uaccess.h ARM: 7528/1: uaccess: annotate [__]{get,put}_user functions with might_fault() 2012-09-09 17:28:48 +01:00
ucontext.h
unaligned.h
unified.h
unistd.h ARM: reserve syscall 378 for kcmp 2012-09-21 17:56:25 +01:00
unwind.h
user.h
vfp.h
vfpmacros.h
vga.h
word-at-a-time.h ARM: 7450/1: dcache: select DCACHE_WORD_ACCESS for little-endian ARMv6+ CPUs 2012-07-09 17:41:11 +01:00
xor.h