Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5ae084f1 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "dma-mapping: Exclude remap functions when arch does not use DMA"

parents d24b07e5 e2d07064

include/linux/dma-mapping.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -87,6 +87,8 @@ static inline int is_device_dma_capable(struct device *dev) 
#else

#else

#include <asm-generic/dma-mapping-broken.h>

#include <asm-generic/dma-mapping-broken.h>

#endif

#endif



#ifndef CONFIG_NO_DMA

static inline void *dma_remap(struct device *dev, void *cpu_addr,

static inline void *dma_remap(struct device *dev, void *cpu_addr,

		dma_addr_t dma_handle, size_t size, struct dma_attrs *attrs)

		dma_addr_t dma_handle, size_t size, struct dma_attrs *attrs)

{

{
@@ -117,6 +119,7 @@ static inline void dma_unremap(struct device *dev, void *remapped_addr, 




	return ops->unremap(dev, remapped_addr, size);

	return ops->unremap(dev, remapped_addr, size);

}

}

#endif









static inline u64 dma_get_mask(struct device *dev)

static inline u64 dma_get_mask(struct device *dev)