[PATCH 17/18] arch/sparc: Implement <asm/fb.h> with generic helpers

Thomas Zimmermann tzimmermann at suse.de
Thu Apr 6 01:05:53 AEST 2023

Replace the architecture's fb_pgprotect() with the generic one
from <asm-generic/fb.h> on 32-bit builds. No functional changes.

Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
Cc: "David S. Miller" <davem at davemloft.net>
 arch/sparc/include/asm/fb.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/fb.h
index e4ef1955b2b6..da411d77bafb 100644
--- a/arch/sparc/include/asm/fb.h
+++ b/arch/sparc/include/asm/fb.h
@@ -5,18 +5,22 @@
 #include <linux/fs.h>
 #include <asm/page.h>
-#include <asm/prom.h>
 struct fb_info;
+struct file;
+#ifdef CONFIG_SPARC64
 static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma,
 				unsigned long off)
-#ifdef CONFIG_SPARC64
 	vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot);
+#define fb_pgprotect fb_pgprotect
 int fb_is_primary_device(struct fb_info *info);
+#define fb_is_primary_device fb_is_primary_device
+#include <asm-generic/fb.h>
 #endif /* _SPARC_FB_H_ */

More information about the Linuxppc-dev mailing list