diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 23:50:23 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-06-04 23:50:23 +0300 |
| commit | 23df9ba64bb9e26cfee6b34f5c3ece49a8a61ee1 (patch) | |
| tree | fdf7e069a458588c88fae7c59704c6ab7dc10b30 /arch/parisc/include | |
| parent | 4ccbe91de91a8f9559052179d15c0229a8ac9f8a (diff) | |
| parent | b046f984814af7985f444150ec28716d42d00d9a (diff) | |
| download | linux-23df9ba64bb9e26cfee6b34f5c3ece49a8a61ee1.tar.xz | |
Merge tag 'for-5.19/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux
Pull more parisc architecture updates from Helge Deller:
"A fix to prevent crash at bootup if CONFIG_SCHED_MC is enabled, and
add auto-detection of primary graphics card for framebuffer driver"
* tag 'for-5.19/parisc-2' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux:
parisc/stifb: Keep track of hardware path of graphics card
parisc/stifb: Implement fb_is_primary_device()
parisc: fix a crash with multicore scheduler
Diffstat (limited to 'arch/parisc/include')
| -rw-r--r-- | arch/parisc/include/asm/fb.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/parisc/include/asm/fb.h b/arch/parisc/include/asm/fb.h index c4cd6360f996..d63a2acb91f2 100644 --- a/arch/parisc/include/asm/fb.h +++ b/arch/parisc/include/asm/fb.h @@ -12,9 +12,13 @@ static inline void fb_pgprotect(struct file *file, struct vm_area_struct *vma, pgprot_val(vma->vm_page_prot) |= _PAGE_NO_CACHE; } +#if defined(CONFIG_STI_CONSOLE) || defined(CONFIG_FB_STI) +int fb_is_primary_device(struct fb_info *info); +#else static inline int fb_is_primary_device(struct fb_info *info) { return 0; } +#endif #endif /* _ASM_FB_H_ */ |