kernel-fxtec-pro1x/arch/microblaze/include/asm
Linus Torvalds 58bca4a8fa Merge branch 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping
Pull DMA mapping branch from Marek Szyprowski:
 "Short summary for the whole series:

  A few limitations have been identified in the current dma-mapping
  design and its implementations for various architectures.  There exist
  more than one function for allocating and freeing the buffers:
  currently these 3 are used dma_{alloc, free}_coherent,
  dma_{alloc,free}_writecombine, dma_{alloc,free}_noncoherent.

  For most of the systems these calls are almost equivalent and can be
  interchanged.  For others, especially the truly non-coherent ones
  (like ARM), the difference can be easily noticed in overall driver
  performance.  Sadly not all architectures provide implementations for
  all of them, so the drivers might need to be adapted and cannot be
  easily shared between different architectures.  The provided patches
  unify all these functions and hide the differences under the already
  existing dma attributes concept.  The thread with more references is
  available here:

    http://www.spinics.net/lists/linux-sh/msg09777.html

  These patches are also a prerequisite for unifying DMA-mapping
  implementation on ARM architecture with the common one provided by
  dma_map_ops structure and extending it with IOMMU support.  More
  information is available in the following thread:

    http://thread.gmane.org/gmane.linux.kernel.cross-arch/12819

  More works on dma-mapping framework are planned, especially in the
  area of buffer sharing and managing the shared mappings (together with
  the recently introduced dma_buf interface: commit d15bd7ee44
  "dma-buf: Introduce dma buffer sharing mechanism").

  The patches in the current set introduce a new alloc/free methods
  (with support for memory attributes) in dma_map_ops structure, which
  will later replace dma_alloc_coherent and dma_alloc_writecombine
  functions."

People finally started piping up with support for merging this, so I'm
merging it as the last of the pending stuff from the merge window.
Looks like pohmelfs is going to wait for 3.5 and more external support
for merging.

* 'for-linus' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
  common: DMA-mapping: add NON-CONSISTENT attribute
  common: DMA-mapping: add WRITE_COMBINE attribute
  common: dma-mapping: introduce mmap method
  common: dma-mapping: remove old alloc_coherent and free_coherent methods
  Hexagon: adapt for dma_map_ops changes
  Unicore32: adapt for dma_map_ops changes
  Microblaze: adapt for dma_map_ops changes
  SH: adapt for dma_map_ops changes
  Alpha: adapt for dma_map_ops changes
  SPARC: adapt for dma_map_ops changes
  PowerPC: adapt for dma_map_ops changes
  MIPS: adapt for dma_map_ops changes
  X86 & IA64: adapt for dma_map_ops changes
  common: dma-mapping: introduce generic alloc() and free() methods
2012-04-04 17:13:43 -07:00
..
asm-compat.h
asm-offsets.h
atomic.h Disintegrate asm/system.h for Microblaze 2012-03-28 18:30:02 +01:00
auxvec.h
barrier.h Disintegrate asm/system.h for Microblaze 2012-03-28 18:30:02 +01:00
bitops.h
bitsperlong.h
bug.h
bugs.h
byteorder.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
cache.h
cacheflush.h microblaze: trivial: Add one empty line 2011-03-09 08:09:57 +01:00
checksum.h microblaze: Add support for little-endian Microblaze 2010-10-21 15:51:59 +10:00
clinkage.h
cmpxchg.h microblaze: Add missing headers caused by disintegration asm/system.h 2012-03-30 12:11:46 +02:00
cpuinfo.h microblaze: Unprivileged stream instruction awareness 2011-07-25 09:13:42 +02:00
cputable.h
cputime.h
current.h
delay.h
device.h
div64.h
dma-mapping.h Microblaze: adapt for dma_map_ops changes 2012-03-28 16:36:38 +02:00
dma.h
elf.h microblaze: Switch ELF_ARCH code to 189 2011-10-14 12:24:31 +02:00
emergency-restart.h
entry.h microblaze: Remove r0_ram pointer and PTO alignment 2011-03-09 08:09:54 +01:00
errno.h
exceptions.h microblaze: Fix sparse warning - fault.c 2011-03-09 08:09:59 +01:00
exec.h Disintegrate asm/system.h for Microblaze 2012-03-28 18:30:02 +01:00
fb.h
fcntl.h
fixmap.h microblaze: Highmem support 2012-03-23 09:28:13 +01:00
flat.h
ftrace.h
futex.h microblaze: Fix __futex_atomic_op macro register usage 2012-03-28 08:28:24 +02:00
gpio.h microblaze: support gpio_to_irq() 2010-10-21 15:51:41 +10:00
hardirq.h irq_domain/microblaze: Convert microblaze to use irq_domains 2012-02-16 06:11:24 -07:00
highmem.h microblaze: Highmem support 2012-03-23 09:28:13 +01:00
hw_irq.h
io.h Fix common misspellings 2011-03-31 11:26:23 -03:00
ioctl.h
ioctls.h
ipcbuf.h
irq.h irq_domain/microblaze: Convert microblaze to use irq_domains 2012-02-16 06:11:24 -07:00
irq_regs.h
irqflags.h microblaze/irqs: Do not trace arch_local_{*,irq_*} functions 2011-07-25 09:07:45 +02:00
Kbuild
kdebug.h
kgdb.h
kmap_types.h
linkage.h
local.h
local64.h
mman.h
mmu.h microblaze: Handle TLB skip size dynamically 2012-03-23 09:28:19 +01:00
mmu_context.h
mmu_context_mm.h atomic: use <linux/atomic.h> 2011-07-26 16:49:47 -07:00
module.h
msgbuf.h
mutex.h
page.h Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
param.h
parport.h
pci-bridge.h microblaze/PCI: remove unused pci_flags 2012-02-23 20:18:57 -07:00
pci.h PCI: collapse pcibios_resource_to_bus 2012-02-23 20:19:04 -07:00
percpu.h
pgalloc.h microblaze: Fix pmd_populate macro 2010-10-21 15:51:20 +10:00
pgtable.h Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2012-03-27 18:20:56 -07:00
poll.h
posix_types.h
processor.h microblaze: Fix ret_from_fork declaration 2012-04-02 13:00:26 +02:00
prom.h Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze 2011-07-27 09:24:20 -07:00
ptrace.h Audit: push audit success and retcode into arch ptrace.h 2012-01-17 16:16:56 -05:00
pvr.h microblaze: Unprivileged stream instruction awareness 2011-07-25 09:13:42 +02:00
registers.h
resource.h
scatterlist.h remove needless ISA_DMA_THRESHOLD 2010-08-07 18:15:50 +02:00
seccomp.h microblaze: Add seccomp support 2010-10-21 15:51:25 +10:00
sections.h
selfmod.h
sembuf.h
serial.h
setup.h Disintegrate and delete asm/system.h 2012-03-28 15:58:21 -07:00
shmbuf.h
shmparam.h
sigcontext.h
siginfo.h
signal.h
socket.h
sockios.h
stat.h
statfs.h
string.h
swab.h
switch_to.h Disintegrate asm/system.h for Microblaze 2012-03-28 18:30:02 +01:00
syscall.h microblaze: Fix sparse warnings - ptrace 2011-03-09 08:09:58 +01:00
syscalls.h microblaze: Fix missing microblaze specific syscalls declaration 2011-03-09 08:09:58 +01:00
termbits.h
termios.h
thread_info.h freezer: remove now unused TIF_FREEZE 2011-11-21 12:32:25 -08:00
timex.h
tlb.h microblaze: Fix missing pagemap.h 2011-01-16 14:29:21 +01:00
tlbflush.h
topology.h
types.h
uaccess.h microblaze: mm: Fix lowmem max memory size limits 2012-03-23 09:28:10 +01:00
ucontext.h
unaligned.h microblaze: Fix unaligned.h for endians 2011-03-09 08:09:53 +01:00
unistd.h microblaze: Wire-up new system calls 2012-01-05 11:16:51 +01:00
unwind.h
user.h
vga.h
xor.h