Commit 0b1abd1f authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: merge <linux/dma-contiguous.h> into <linux/dma-map-ops.h> 



Merge dma-contiguous.h into dma-map-ops.h, after removing the comment
describing the contiguous allocator into kernel/dma/contigous.c.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 580a0cc9

Documentation/admin-guide/kernel-parameters.txt

+1 −1
Original line number Diff line number Diff line
@@ -597,7 +597,7 @@ 
			placement constraint by the physical address range of

			memory allocations. A value of 0 disables CMA

			altogether. For more information, see

			include/linux/dma-contiguous.h

			kernel/dma/contiguous.c



	cma_pernuma=nn[MG]

			[ARM64,KNL]

arch/arm/mach-davinci/devices-da8xx.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/clk-provider.h>

#include <linux/clk.h>

#include <linux/clkdev.h>

#include <linux/dma-contiguous.h>

#include <linux/dma-map-ops.h>

#include <linux/dmaengine.h>

#include <linux/init.h>

#include <linux/io.h>

arch/arm/mach-shmobile/setup-rcar-gen2.c

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


#include <linux/clocksource.h>

#include <linux/device.h>

#include <linux/dma-contiguous.h>

#include <linux/dma-map-ops.h>

#include <linux/io.h>

#include <linux/kernel.h>

#include <linux/memblock.h>

arch/arm/mm/dma-mapping.c

+0 −1
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
#include <linux/dma-direct.h>

#include <linux/dma-map-ops.h>

#include <linux/dma-noncoherent.h>

#include <linux/dma-contiguous.h>

#include <linux/highmem.h>

#include <linux/memblock.h>

#include <linux/slab.h>

arch/arm/mm/init.c

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#include <linux/highmem.h>

#include <linux/gfp.h>

#include <linux/memblock.h>

#include <linux/dma-contiguous.h>

#include <linux/dma-map-ops.h>

#include <linux/sizes.h>

#include <linux/stop_machine.h>

#include <linux/swiotlb.h>

CRA Git | Maintained and supported by SUSTech CRA and CCSE