• Linus Torvalds's avatar
    Merge branch 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping · 32d687ca
    Linus Torvalds authored
    Pull DMA-mapping fixes from Marek Szyprowski:
     "Another set of fixes for ARM dma-mapping subsystem.
    
      Commit e9da6e99 replaced custom consistent buffer remapping code
      with generic vmalloc areas.  It however introduced some regressions
      caused by limited support for allocations in atomic context.  This
      series contains fixes for those regressions.
    
      For some subplatforms the default, pre-allocated pool for atomic
      allocations turned out to be too small, so a function for setting its
      size has been added.
    
      Another set of patches adds support for atomic allocations to
      IOMMU-aware DMA-mapping implementation.
    
      The last part of this pull request contains two fixes for Contiguous
      Memory Allocator, which relax too strict requirements."
    
    * 'fixes-for-3.6' of git://git.linaro.org/people/mszyprowski/linux-dma-mapping:
      ARM: dma-mapping: IOMMU allocates pages from atomic_pool with GFP_ATOMIC
      ARM: dma-mapping: Introduce __atomic_get_pages() for __iommu_get_pages()
      ARM: dma-mapping: Refactor out to introduce __in_atomic_pool
      ARM: dma-mapping: atomic_pool with struct page **pages
      ARM: Kirkwood: increase atomic coherent pool size
      ARM: DMA-Mapping: print warning when atomic coherent allocation fails
      ARM: DMA-Mapping: add function for setting coherent pool size from platform code
      ARM: relax conditions required for enabling Contiguous Memory Allocator
      mm: cma: fix alignment requirements for contiguous regions
    32d687ca
Kconfig 66.5 KB