diff --git a/arch/arm/mm/dma-mapping.c b/arch/arm/mm/dma-mapping.c
index 641034764a0c..75b5b4ee22e8 100644
--- a/arch/arm/mm/dma-mapping.c
+++ b/arch/arm/mm/dma-mapping.c
@@ -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;
diff --git a/include/linux/coresight.h b/include/linux/coresight.h
index 60e1a6b38a79..be5cfe4c50c3 100644
--- a/include/linux/coresight.h
+++ b/include/linux/coresight.h
@@ -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);