A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-08 04:42:04 -04:00
Code Issues Projects Releases Packages Wiki Activity

Merge "arm: mm: Fix compilation error when IOMMU is disabled"

Browse source
This commit is contained in:
qctecmdr 2020-06-13 17:37:51 -07:00 • committed by Gerrit - the friendly Code Review server
commit 0dcf1779de
2 changed files with 13 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

26
arch/arm/mm/dma-mapping.c
View file

@ -122,19 +122,6 @@ static pgprot_t __get_dma_pgprot(unsigned long attrs, pgprot_t prot,
return prot;
}
static bool is_dma_coherent(struct device *dev, unsigned long attrs,
bool is_coherent)
{
if (attrs & DMA_ATTR_FORCE_COHERENT)
is_coherent = true;
else if (attrs & DMA_ATTR_FORCE_NON_COHERENT)
is_coherent = false;
else if (dev->archdata.dma_coherent)
is_coherent = true;
return is_coherent;
}
/**
* arm_dma_map_page - map a portion of a page for streaming DMA
* @dev: valid struct device pointer, or NULL for ISA and EISA-like devices
@ -1146,6 +1133,19 @@ static const struct dma_map_ops *arm_get_dma_map_ops(bool coherent)
#ifdef CONFIG_ARM_DMA_USE_IOMMU
static bool is_dma_coherent(struct device *dev, unsigned long attrs,
bool is_coherent)
{
if (attrs & DMA_ATTR_FORCE_COHERENT)
is_coherent = true;
else if (attrs & DMA_ATTR_FORCE_NON_COHERENT)
is_coherent = false;
else if (dev->archdata.dma_coherent)
is_coherent = true;
return is_coherent;
}
static int __dma_info_to_prot(enum dma_data_direction dir, unsigned long attrs)
{
int prot = 0;

2
include/linux/coresight.h
View file

@ -343,8 +343,6 @@ static inline int coresight_enable_reg_clk(struct coresight_device *csdev)
{
return -EINVAL;
}
static void coresight_disable_all_source_link(void) {};
static void coresight_enable_all_source_link(void) {};
#endif
extern int coresight_get_cpu(struct device *dev);