[PATCH 17/18] arch/sparc: Implement <asm/fb.h> with generic helpers
Thomas Zimmermann <[email protected]>
| Newsgroups | gmane.linux.kernel.cross-arch,gmane.comp.video.dri.devel,gmane.linux.kernel.arc,gmane.linux.kernel,gmane.linux.ports.arm.kernel,gmane.linux.ports.ia64,gmane.linux.ports.mips,gmane.linux.ports.parisc,gmane.linux.ports.ppc64.devel,gmane.linux.ports.sh.devel,gmane.linux.ports.sparc |
|---|---|
| Message-ID | <[email protected]> |
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 <[email protected]> Cc: "David S. Miller" <[email protected]> --- 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); -#endif } +#define fb_pgprotect fb_pgprotect +#endif 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