diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-24 11:47:51 +0300 |
|---|---|---|
| committer | Thomas Zimmermann <tzimmermann@suse.de> | 2023-04-26 16:07:57 +0300 |
| commit | 94545f27155df50d2db7a1c896ca6b8e81fb62d1 (patch) | |
| tree | f8074e675f2b037f4eb0b647807771929fe0892f /arch/x86/video | |
| parent | cec5ccef85bd0128cf895612de54a9d21d2015d0 (diff) | |
| download | linux-94545f27155df50d2db7a1c896ca6b8e81fb62d1.tar.xz | |
arch/x86: Include <asm/fb.h> in fbdev source file
Move the implementation of fb_pgprotect() to fbdev.c and include
<asm/fb.h>. 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 <asm/fb.h> 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 <tzimmermann@suse.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230424084751.14641-1-tzimmermann@suse.de
Diffstat (limited to 'arch/x86/video')
| -rw-r--r-- | arch/x86/video/fbdev.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/x86/video/fbdev.c b/arch/x86/video/fbdev.c index 5ec4eafbb981..57ee3c158f97 100644 --- a/arch/x86/video/fbdev.c +++ b/arch/x86/video/fbdev.c @@ -6,11 +6,25 @@ * for more details. * */ + +#include <asm/fb.h> + #include <linux/fb.h> -#include <linux/pci.h> #include <linux/module.h> +#include <linux/pci.h> #include <linux/vgaarb.h> +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"); |