• Linus Torvalds's avatar
    Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip · 2fcd2b30
    Linus Torvalds authored
    Pull x86 dma mapping updates from Ingo Molnar:
     "This tree, by Christoph Hellwig, switches over the x86 architecture to
      the generic dma-direct and swiotlb code, and also unifies more of the
      dma-direct code between architectures. The now unused x86-only
      primitives are removed"
    * 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
      dma-mapping: Don't clear GFP_ZERO in dma_alloc_attrs
      swiotlb: Make swiotlb_{alloc,free}_buffer depend on CONFIG_DMA_DIRECT_OPS
      dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
      dma/direct: Handle force decryption for DMA coherent buffers in common code
      dma/direct: Handle the memory encryption bit in common code
      dma/swiotlb: Remove swiotlb_set_mem_attributes()
      set_memory.h: Provide set_memory_{en,de}crypted() stubs
      x86/dma: Remove dma_alloc_coherent_gfp_flags()
      iommu/intel-iommu: Enable CONFIG_DMA_DIRECT_OPS=y and clean up intel_{alloc,free}_coherent()
      iommu/amd_iommu: Use CONFIG_DMA_DIRECT_OPS=y and dma_direct_{alloc,free}()
      x86/dma/amd_gart: Use dma_direct_{alloc,free}()
      x86/dma/amd_gart: Look at dev->coherent_dma_mask instead of GFP_DMA
      x86/dma: Use generic swiotlb_ops
      x86/dma: Use DMA-direct (CONFIG_DMA_DIRECT_OPS=y)
      x86/dma: Remove dma_alloc_coherent_mask()
Kconfig 94.6 KB