Linus Torvalds 2fcd2b306a Merge branch 'x86-dma-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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()
2018-04-02 17:18:45 -07:00
..
2015-05-28 15:31:53 +02:00
2017-08-15 22:55:58 +10:00
2015-01-12 05:04:13 -08:00
2015-02-03 18:47:18 +01:00
2016-03-04 23:50:27 -06:00
2016-03-01 19:27:20 +11:00
2017-04-21 21:08:47 +10:00
2017-06-28 06:54:33 -07:00
2016-08-05 09:00:54 -04:00
2018-02-10 13:16:35 -08:00
2018-01-21 23:21:14 +11:00
2018-02-10 13:16:35 -08:00
2017-11-16 12:47:46 -08:00
2017-11-16 12:47:46 -08:00
2018-01-21 01:06:10 +11:00
2016-06-14 13:58:26 +10:00
2018-01-24 11:42:58 +11:00
2018-02-10 13:16:35 -08:00
2016-06-14 13:58:26 +10:00
2018-01-21 22:43:43 +11:00
2017-08-31 14:26:56 +10:00
2017-11-16 12:47:46 -08:00
2018-01-15 09:35:26 +01:00
2017-11-16 12:47:46 -08:00
2017-11-16 12:47:46 -08:00
2016-06-14 13:58:26 +10:00
2017-11-16 12:47:46 -08:00
2017-11-12 09:03:10 +11:00
2015-05-05 13:35:39 -06:00
2018-02-10 13:16:35 -08:00