| Message ID | 20230406143019.6709-3-tzimmermann@suse.de |
|---|---|
| State | Superseded |
| Headers | show |
| Series | arch: Consolidate <asm/fb.h> | expand |
Am 06.04.23 um 16:43 schrieb Arnd Bergmann: > On Thu, Apr 6, 2023, at 16:30, Thomas Zimmermann wrote: >> + >> static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, >> unsigned long off) >> { >> vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); >> } >> +#define fb_pgprotect fb_pgprotect > > I still feel that for architectures like arc that don't have > pgprot_writecombine(), it would b best to go with the > generic implementation that currently behaves the exact > same way. If pgprot_writecombine() gets added in the future, > it would cause the architecture to behave as expected rather > than introducing the same bug that mips has. OK, I'll change it. > > Arnd
diff --git a/arch/arc/include/asm/fb.h b/arch/arc/include/asm/fb.h index dc2e303cdbbb..dff149eaecaf 100644 --- a/arch/arc/include/asm/fb.h +++ b/arch/arc/include/asm/fb.h @@ -1,20 +1,19 @@ /* SPDX-License-Identifier: GPL-2.0 */ + #ifndef _ASM_FB_H_ #define _ASM_FB_H_ -#include <linux/fb.h> -#include <linux/fs.h> #include <asm/page.h> +struct file; + static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, unsigned long off) { vma->vm_page_prot = pgprot_noncached(vma->vm_page_prot); } +#define fb_pgprotect fb_pgprotect -static inline int fb_is_primary_device(struct fb_info *info) -{ - return 0; -} +#include <asm-generic/fb.h> #endif /* _ASM_FB_H_ */
Replace the architecture's fb_is_primary_device() with the generic one from <asm-generic/fb.h>. No functional changes. Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Cc: Vineet Gupta <vgupta@kernel.org> --- arch/arc/include/asm/fb.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)