Commit 3d6f126b authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Christoph Hellwig
Browse files

dma-mapping: move arch_dma_set_mask() declaration to header 



This function has a __weak definition and an override that is only used on
freescale powerpc chips. The powerpc definition however does not see the
declaration that is in a .c file:

arch/powerpc/kernel/dma-mask.c:7:6: error: no previous prototype for 'arch_dma_set_mask' [-Werror=missing-prototypes]

Move it into the linux/dma-map-ops.h header where the other arch_dma_* functions
are declared.

Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent 42e584a9

arch/powerpc/kernel/dma-mask.c

+1 −0
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/dma-mapping.h>

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

#include <linux/export.h>

#include <asm/machdep.h>

include/linux/dma-map-ops.h

+6 −0
Original line number Diff line number Diff line
@@ -343,6 +343,12 @@ void *arch_dma_alloc(struct device *dev, size_t size, dma_addr_t *dma_handle, 
void arch_dma_free(struct device *dev, size_t size, void *cpu_addr,

		dma_addr_t dma_addr, unsigned long attrs);



#ifdef CONFIG_ARCH_HAS_DMA_SET_MASK

void arch_dma_set_mask(struct device *dev, u64 mask);

#else

#define arch_dma_set_mask(dev, mask)	do { } while (0)

#endif



#ifdef CONFIG_MMU

/*

 * Page protection so that devices that can't snoop CPU caches can use the

kernel/dma/mapping.c

+0 −6
Original line number Diff line number Diff line
@@ -760,12 +760,6 @@ bool dma_pci_p2pdma_supported(struct device *dev) 
}

EXPORT_SYMBOL_GPL(dma_pci_p2pdma_supported);



#ifdef CONFIG_ARCH_HAS_DMA_SET_MASK

void arch_dma_set_mask(struct device *dev, u64 mask);

#else

#define arch_dma_set_mask(dev, mask)	do { } while (0)

#endif



int dma_set_mask(struct device *dev, u64 mask)

{

	/*