Skip to content
  • Linus Torvalds's avatar
    Merge branch 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 6f51f515
    Linus Torvalds authored
    Pull DMA-mapping updates from Marek Szyprowski:
     "Those patches are continuation of my earlier work.
    
      They contains extensions to DMA-mapping framework to remove limitation
      of the current ARM implementation (like limited total size of DMA
      coherent/write combine buffers), improve performance of buffer sharing
      between devices (attributes to skip cpu cache operations or creation
      of additional kernel mapping for some specific use cases) as well as
      some unification of the common code for dma_mmap_attrs() and
      dma_mmap_coherent() functions.  All extensions have been implemented
      and tested for ARM architecture."
    
    * 'for-linus-for-3.6-rc1' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
      ARM: dma-mapping: add support for DMA_ATTR_SKIP_CPU_SYNC attribute
      common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
      ARM: dma-mapping: add support for dma_get_sgtable()
      common: dma-mapping: introduce dma_get_sgtable() function
      ARM: dma-mapping: add support for DMA_ATTR_NO_KERNEL_MAPPING attribute
      common: DMA-mapping: add DMA_ATTR_NO_KERNEL_MAPPING attribute
      common: dma-mapping: add support for generic dma_mmap_* calls
      ARM: dma-mapping: fix error path for memory allocation failure
      ARM: dma-mapping: add more sanity checks in arm_dma_mmap()
      ARM: dma-mapping: remove custom consistent dma region
      mm: vmalloc: use const void * for caller argument
      scatterlist: add sg_alloc_table_from_pages function
    6f51f515