Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

fbdev: Avoid file argument in fb_pgprotect()

Only PowerPC's fb_pgprotect() needs the file argument, although
the implementation in either phys_mem_access_prot() or
pci_phys_mem_access_prot() does not use it. Pass NULL to the internal
helper in preparation of further updates. A later patch will remove
the file parameter from fb_pgprotect().

While at it, replace the shift operation with PHYS_PFN().

v5:
* state function names in commit description (Javier)

Suggested-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230922080636.26762-2-tzimmermann@suse.de

+6 -1
+6 -1
arch/powerpc/include/asm/fb.h
··· 9 9 static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, 10 10 unsigned long off) 11 11 { 12 - vma->vm_page_prot = phys_mem_access_prot(file, off >> PAGE_SHIFT, 12 + /* 13 + * PowerPC's implementation of phys_mem_access_prot() does 14 + * not use the file argument. Set it to NULL in preparation 15 + * of later updates to the interface. 16 + */ 17 + vma->vm_page_prot = phys_mem_access_prot(NULL, PHYS_PFN(off), 13 18 vma->vm_end - vma->vm_start, 14 19 vma->vm_page_prot); 15 20 }