Merge tag 'dma-mapping-6.7-2023-10-30' of git://git.infradead.org/users/hch/dma-mapping
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
No related branches found
No related tags found
Showing
- arch/arm/Kconfig 1 addition, 0 deletionsarch/arm/Kconfig
- arch/m68k/Kconfig 3 additions, 3 deletionsarch/m68k/Kconfig
- arch/m68k/Kconfig.cpu 12 additions, 0 deletionsarch/m68k/Kconfig.cpu
- arch/m68k/kernel/Makefile 1 addition, 1 deletionarch/m68k/kernel/Makefile
- arch/m68k/kernel/dma.c 1 addition, 33 deletionsarch/m68k/kernel/dma.c
- arch/parisc/Kconfig 1 addition, 0 deletionsarch/parisc/Kconfig
- drivers/net/ethernet/freescale/fec_main.c 76 additions, 10 deletionsdrivers/net/ethernet/freescale/fec_main.c
- kernel/dma/Kconfig 11 additions, 0 deletionskernel/dma/Kconfig
- kernel/dma/debug.c 1 addition, 1 deletionkernel/dma/debug.c
- kernel/dma/direct.c 13 additions, 24 deletionskernel/dma/direct.c
- kernel/dma/swiotlb.c 7 additions, 5 deletionskernel/dma/swiotlb.c
Loading
Please register or sign in to comment