• Linus Torvalds's avatar
    Merge tag 'dma-mapping-6.7-2023-10-30' of git://git.infradead.org/users/hch/dma-mapping · 009fbfc9
    Linus Torvalds authored
    Pull dma-mapping updates from Christoph Hellwig:
    
     - get rid of the fake support for coherent DMA allocation on coldfire
       with caches (Christoph Hellwig)
    
     - add a few Kconfig dependencies so that Kconfig catches the use of
       invalid configurations (Christoph Hellwig)
    
     - fix a type in dma-debug output (Chuck Lever)
    
     - rewrite a comment in swiotlb (Sean Christopherson)
    
    * tag 'dma-mapping-6.7-2023-10-30' of git://git.infradead.org/users/hch/dma-mapping:
      dma-debug: Fix a typo in a debugging eye-catcher
      swiotlb: rewrite comment explaining why the source is preserved on DMA_FROM_DEVICE
      m68k: remove unused includes from dma.c
      m68k: don't provide arch_dma_alloc for nommu/coldfire
      net: fec: use dma_alloc_noncoherent for data cache enabled coldfire
      m68k: use the coherent DMA code for coldfire without data cache
      dma-direct: warn when coherent allocations aren't supported
      dma-direct: simplify the use atomic pool logic in dma_direct_alloc
      dma-direct: add a CONFIG_ARCH_HAS_DMA_ALLOC symbol
      dma-direct: add dependencies to CONFIG_DMA_GLOBAL_POOL
    009fbfc9
swiotlb.c 46.5 KB