[PATCH v2 18/19] arch/sparc: Implement <asm/fb.h> with generic helpers
From: Thomas Zimmermann <tzimmermann@suse.de>
Date: 2023-04-06 14:31:47
Also in:
dri-devel, linux-arch, linux-arm-kernel, linux-fbdev, linux-m68k, linux-mips, linux-sh, lkml, loongarch, sparclinux
Subsystem:
sparc + ultrasparc (sparc/sparc64), the rest · Maintainers:
"David S. Miller", Andreas Larsson, Linus Torvalds
Include <asm-generic/fb.h> for correctness. Sparc does provide it's own implementation of the contained functions. v2: * restore the original fb_pgprotect() Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: "David S. Miller" <davem@davemloft.net> --- arch/sparc/include/asm/fb.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/arch/sparc/include/asm/fb.h b/arch/sparc/include/asm/fb.h
index 28609f7a965c..496e58d22e7b 100644
--- a/arch/sparc/include/asm/fb.h
+++ b/arch/sparc/include/asm/fb.h@@ -2,11 +2,10 @@ #ifndef _SPARC_FB_H_ #define _SPARC_FB_H_ -#include <linux/fs.h> - #include <asm/page.h> struct fb_info; +struct file; static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off)
@@ -15,7 +14,11 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); #endif } +#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_ */
--
2.40.0