Commit 6d90eb7b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping 

Pull dma-mapping rename from Christoph Hellwig:
 "Move all the dma-mapping code to kernel/dma and lose their dma-*
  prefixes"

* tag 'dma-rename-4.18' of git://git.infradead.org/users/hch/dma-mapping:
  dma-mapping: move all DMA mapping code to kernel/dma
  dma-mapping: use obj-y instead of lib-y for generic dma ops
parents f5b65348 cf65a0f6

Documentation/driver-api/infrastructure.rst

+2 −2
Original line number Diff line number Diff line
@@ -49,10 +49,10 @@ Device Drivers Base 
Device Drivers DMA Management

-----------------------------



.. kernel-doc:: drivers/base/dma-coherent.c

.. kernel-doc:: kernel/dma/coherent.c

   :export:



.. kernel-doc:: drivers/base/dma-mapping.c

.. kernel-doc:: kernel/dma/mapping.c

   :export:



Device drivers PnP support

MAINTAINERS

+2 −7
Original line number Diff line number Diff line
@@ -4360,12 +4360,7 @@ L: iommu@lists.linux-foundation.org 
T:	git git://git.infradead.org/users/hch/dma-mapping.git

W:	http://git.infradead.org/users/hch/dma-mapping.git

S:	Supported

F:	lib/dma-debug.c

F:	lib/dma-direct.c

F:	lib/dma-noncoherent.c

F:	lib/dma-virt.c

F:	drivers/base/dma-mapping.c

F:	drivers/base/dma-coherent.c

F:	kernel/dma/

F:	include/asm-generic/dma-mapping.h

F:	include/linux/dma-direct.h

F:	include/linux/dma-mapping.h
@@ -13648,7 +13643,7 @@ M: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> 
L:	iommu@lists.linux-foundation.org

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/konrad/swiotlb.git

S:	Supported

F:	lib/swiotlb.c

F:	kernel/dma/swiotlb.c

F:	arch/*/kernel/pci-swiotlb.c

F:	include/linux/swiotlb.h

drivers/base/Makefile

+0 −3
Original line number Diff line number Diff line
@@ -8,10 +8,7 @@ obj-y := component.o core.o bus.o dd.o syscore.o \ 
			   topology.o container.o property.o cacheinfo.o \

			   devcon.o

obj-$(CONFIG_DEVTMPFS)	+= devtmpfs.o

obj-$(CONFIG_DMA_CMA) += dma-contiguous.o

obj-y			+= power/

obj-$(CONFIG_HAS_DMA)	+= dma-mapping.o

obj-$(CONFIG_HAVE_GENERIC_DMA_COHERENT) += dma-coherent.o

obj-$(CONFIG_ISA_BUS_API)	+= isa.o

obj-y				+= firmware_loader/

obj-$(CONFIG_NUMA)	+= node.o

include/linux/dma-contiguous.h

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
 *   CMA should not be used by the device drivers directly. It is

 *   only a helper framework for dma-mapping subsystem.

 *

 *   For more information, see kernel-docs in drivers/base/dma-contiguous.c

 *   For more information, see kernel-docs in kernel/dma/contiguous.c

 */



#ifdef __KERNEL__

init/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -1719,10 +1719,6 @@ source "arch/Kconfig" 


endmenu		# General setup



config HAVE_GENERIC_DMA_COHERENT

	bool

	default n



config RT_MUTEXES

	bool

CRA Git | Maintained and supported by SUSTech CRA and CCSE