From 94545f27155df50d2db7a1c896ca6b8e81fb62d1 Mon Sep 17 00:00:00 2001 From: Thomas Zimmermann Date: Mon, 24 Apr 2023 10:47:51 +0200 Subject: [PATCH] arch/x86: Include in fbdev source file Move the implementation of fb_pgprotect() to fbdev.c and include . Fixes the following warning: ../arch/x86/video/fbdev.c:14:5: warning: no previous prototype for 'fb_is_primary_device' [-Wmissing-prototypes] 14 | int fb_is_primary_device(struct fb_info *info) | ^~~~~~~~~~~~~~~~~~~~ Just including results in a number of built-in errors about undefined function. Moving fb_pgprotect() to the source file avoids the required include statements in the header. The function is only called occasionally from fb_mmap(), [1] so having it as static inline had no benefit. While at it, fix the codying style in fbdev.c. Link: https://elixir.bootlin.com/linux/v6.3-rc7/source/drivers/video/fbdev/core/fbmem.c#L1404 # 1 Signed-off-by: Thomas Zimmermann Reviewed-by: Javier Martinez Canillas Link: https://patchwork.freedesktop.org/patch/msgid/20230424084751.14641-1-tzimmermann@suse.de --- arch/x86/include/asm/fb.h | 14 ++------------ arch/x86/video/fbdev.c | 17 ++++++++++++++++- 2 files changed, 18 insertions(+), 13 deletions(-) diff --git a/arch/x86/include/asm/fb.h b/arch/x86/include/asm/fb.h index a3fb801f12f18..23873da8fb77c 100644 --- a/arch/x86/include/asm/fb.h +++ b/arch/x86/include/asm/fb.h @@ -2,21 +2,11 @@ #ifndef _ASM_X86_FB_H #define _ASM_X86_FB_H -#include - struct fb_info; struct file; +struct vm_area_struct; -static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, - unsigned long off) -{ - unsigned long prot; - - prot = pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK; - if (boot_cpu_data.x86 > 3) - pgprot_val(vma->vm_page_prot) = - prot | cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); -} +void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off); #define fb_pgprotect fb_pgprotect int fb_is_primary_device(struct fb_info *info); diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c index 5ec4eafbb9811..57ee3c158f976 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/fbdev.c @@ -6,11 +6,25 @@ * for more details. * */ + +#include + #include -#include #include +#include #include +void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) +{ + unsigned long prot; + + prot = pgprot_val(vma->vm_page_prot) & ~_PAGE_CACHE_MASK; + if (boot_cpu_data.x86 > 3) + pgprot_val(vma->vm_page_prot) = + prot | cachemode2protval(_PAGE_CACHE_MODE_UC_MINUS); +} +EXPORT_SYMBOL(fb_pgprotect); + int fb_is_primary_device(struct fb_info *info) { struct device *device = info->device; @@ -26,4 +40,5 @@ int fb_is_primary_device(struct fb_info *info) return 0; } EXPORT_SYMBOL(fb_is_primary_device); + MODULE_LICENSE("GPL"); -- 2.30.2