diff options
| author | Mario Limonciello (AMD) <superm1@kernel.org> | 2025-08-11 11:26:03 -0500 |
|---|---|---|
| committer | Mario Limonciello (AMD) <superm1@kernel.org> | 2025-09-10 09:35:33 -0500 |
| commit | 6e490dea61b88aac9762c9f79a54aad4ea2e6cd1 (patch) | |
| tree | cfdf7c516a98a45a8aec4b24fb2e85bf14bc9922 | |
| parent | MAINTAINERS: Remove Jacek Lawrynowicz as intel_vpu maintainer (diff) | |
| download | linux-6e490dea61b88aac9762c9f79a54aad4ea2e6cd1.tar.gz linux-6e490dea61b88aac9762c9f79a54aad4ea2e6cd1.zip | |
Fix access to video_is_primary_device() when compiled without CONFIG_VIDEO
When compiled without CONFIG_VIDEO the architecture specific
implementations of video_is_primary_device() include prototypes and
assume that video-common.c will be linked. Guard against this so that the
fallback inline implementation that returns false will be used when
compiled without CONFIG_VIDEO.
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202506221312.49Fy1aNA-lkp@intel.com/
Link: https://lore.kernel.org/r/20250811162606.587759-2-superm1@kernel.org
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
| -rw-r--r-- | arch/parisc/include/asm/video.h | 2 | ||||
| -rw-r--r-- | arch/sparc/include/asm/video.h | 2 | ||||
| -rw-r--r-- | arch/x86/include/asm/video.h | 2 |
3 files changed, 5 insertions, 1 deletions
diff --git a/arch/parisc/include/asm/video.h b/arch/parisc/include/asm/video.h index c5dff3223194..a9d50ebd6e76 100644 --- a/arch/parisc/include/asm/video.h +++ b/arch/parisc/include/asm/video.h @@ -6,7 +6,7 @@ struct device; -#if defined(CONFIG_STI_CORE) +#if defined(CONFIG_STI_CORE) && defined(CONFIG_VIDEO) bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device #endif diff --git a/arch/sparc/include/asm/video.h b/arch/sparc/include/asm/video.h index a6f48f52db58..773717b6d491 100644 --- a/arch/sparc/include/asm/video.h +++ b/arch/sparc/include/asm/video.h @@ -19,8 +19,10 @@ static inline pgprot_t pgprot_framebuffer(pgprot_t prot, #define pgprot_framebuffer pgprot_framebuffer #endif +#ifdef CONFIG_VIDEO bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device +#endif static inline void fb_memcpy_fromio(void *to, const volatile void __iomem *from, size_t n) { diff --git a/arch/x86/include/asm/video.h b/arch/x86/include/asm/video.h index 0950c9535fae..08ec328203ef 100644 --- a/arch/x86/include/asm/video.h +++ b/arch/x86/include/asm/video.h @@ -13,8 +13,10 @@ pgprot_t pgprot_framebuffer(pgprot_t prot, unsigned long offset); #define pgprot_framebuffer pgprot_framebuffer +#ifdef CONFIG_VIDEO bool video_is_primary_device(struct device *dev); #define video_is_primary_device video_is_primary_device +#endif #include <asm-generic/video.h> |