--- zzzz-none-000/linux-3.10.107/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2017-06-27 09:49:32.000000000 +0000
+++ scorpion-7490-727/linux-3.10.107/arch/mips/include/asm/mach-cavium-octeon/dma-coherence.h	2021-02-04 17:41:59.000000000 +0000
@@ -13,6 +13,8 @@
 #ifndef __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H
 #define __ASM_MACH_CAVIUM_OCTEON_DMA_COHERENCE_H
 
+#include <linux/bug.h>
+
 struct device;
 
 extern void octeon_pci_dma_init(void);
@@ -21,18 +23,21 @@
 	size_t size)
 {
 	BUG();
+	return 0;
 }
 
 static inline dma_addr_t plat_map_dma_mem_page(struct device *dev,
 	struct page *page)
 {
 	BUG();
+	return 0;
 }
 
 static inline unsigned long plat_dma_addr_to_phys(struct device *dev,
 	dma_addr_t dma_addr)
 {
 	BUG();
+	return 0;
 }
 
 static inline void plat_unmap_dma_mem(struct device *dev, dma_addr_t dma_addr,
@@ -44,11 +49,7 @@
 static inline int plat_dma_supported(struct device *dev, u64 mask)
 {
 	BUG();
-}
-
-static inline void plat_extra_sync_for_device(struct device *dev)
-{
-	BUG();
+	return 0;
 }
 
 static inline int plat_device_is_coherent(struct device *dev)
@@ -56,10 +57,8 @@
 	return 1;
 }
 
-static inline int plat_dma_mapping_error(struct device *dev,
-					 dma_addr_t dma_addr)
+static inline void plat_post_dma_flush(struct device *dev)
 {
-	BUG();
 }
 
 dma_addr_t phys_to_dma(struct device *dev, phys_addr_t paddr);