Commit 5db5d930 authored by Christoph Hellwig's avatar Christoph Hellwig
Browse files

dma-mapping: remove <asm/dma-contiguous.h> 



Just provide a weak default definition of dma_contiguous_early_fixup and
let arm override it.

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

arch/arm/include/asm/dma-contiguous.h

deleted100644 → 0
+0 −15
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef ASMARM_DMA_CONTIGUOUS_H

#define ASMARM_DMA_CONTIGUOUS_H



#ifdef __KERNEL__

#ifdef CONFIG_DMA_CMA



#include <linux/types.h>



void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);



#endif

#endif



#endif

arch/arm/mm/dma-mapping.c

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
#include <asm/dma-iommu.h>

#include <asm/mach/map.h>

#include <asm/system_info.h>

#include <asm/dma-contiguous.h>

#include <xen/swiotlb-xen.h>



#include "dma.h"

include/asm-generic/Kbuild

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ mandatory-y += current.h 
mandatory-y += delay.h

mandatory-y += device.h

mandatory-y += div64.h

mandatory-y += dma-contiguous.h

mandatory-y += dma-mapping.h

mandatory-y += dma.h

mandatory-y += emergency-restart.h

include/asm-generic/dma-contiguous.h

deleted100644 → 0
+0 −10
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_GENERIC_DMA_CONTIGUOUS_H

#define _ASM_GENERIC_DMA_CONTIGUOUS_H



#include <linux/types.h>



static inline void

dma_contiguous_early_fixup(phys_addr_t base, unsigned long size) { }



#endif

include/linux/dma-map-ops.h

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,8 @@ bool dma_release_from_contiguous(struct device *dev, struct page *pages, 
				 int count);

struct page *dma_alloc_contiguous(struct device *dev, size_t size, gfp_t gfp);

void dma_free_contiguous(struct device *dev, struct page *page, size_t size);



void dma_contiguous_early_fixup(phys_addr_t base, unsigned long size);

#else /* CONFIG_DMA_CMA */

static inline struct cma *dev_get_cma_area(struct device *dev)

{