--- arch/mips/vdso/vdso.lds.S.old	2020-02-24 15:02:15.457220425 +0100
+++ arch/mips/vdso/vdso.lds.S	2020-02-24 15:02:28.887203410 +0100
@@ -18,6 +18,8 @@
 OUTPUT_FORMAT("elf32-tradlittlemips", "elf32-tradbigmips", "elf32-tradlittlemips")
 #endif
 
+#undef mips
+#define mips mips
 OUTPUT_ARCH(mips)
 
 SECTIONS
--- drivers/video/fbdev/impact.c.old	2020-02-24 15:50:26.542100094 +0100
+++ drivers/video/fbdev/impact.c	2020-02-24 15:53:28.414918484 +0100
@@ -309,7 +309,7 @@
 	return dma_alloc_coherent(dev, size, dma_handle, gfp);
 #else
 	/* IP22/IP28 are noncoherent. */
-	return dma_alloc_noncoherent(dev, size, dma_handle, gfp);
+	return dma_alloc_attrs(dev, size, dma_handle, gfp, DMA_ATTR_NON_CONSISTENT);
 #endif
 }
 
@@ -329,7 +329,7 @@
 	dma_free_coherent(dev, size, vaddr, dma_handle);
 #else
 	/* IP22/IP28 are noncoherent. */
-	dma_free_noncoherent(dev, size, vaddr, dma_handle);
+	dma_free_attrs(dev, size, vaddr, dma_handle, DMA_ATTR_NON_CONSISTENT);
 #endif
 }