diff options
| author | Thomas Zimmermann <tzimmermann@suse.de> | 2024-05-17 11:14:33 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2024-05-20 21:17:06 +0000 |
| commit | 34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec (patch) | |
| tree | 756118ee8eb174d02588d7123895982653f84a06 | |
| parent | e7cda7fe37ff1ece39bd2bf35ea68b1175395d95 (diff) | |
| download | linux-34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec.tar.gz linux-34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec.tar.bz2 linux-34cda5ab89d4f30bc8d8f8d28980a7b8c68db6ec.zip | |
arch: Fix name collision with ACPI's video.o
Commit 2fd001cd3600 ("arch: Rename fbdev header and source files")
renames the video source files under arch/ such that they do not
refer to fbdev any longer. The new files named video.o conflict with
ACPI's video.ko module. Modprobing the ACPI module can then fail with
warnings about missing symbols, as shown below.
(i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_unregister (err -2)
(i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register_backlight (err -2)
(i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol __acpi_video_get_backlight_type (err -2)
(i915_selftest:1107) igt_kmod-WARNING: i915: Unknown symbol acpi_video_register (err -2)
Fix the issue by renaming the architecture's video.o to video-common.o.
Reported-by: Chaitanya Kumar Borah <chaitanya.kumar.borah@intel.com>
Closes: https://lore.kernel.org/intel-gfx/9dcac6e9-a3bf-4ace-bbdc-f697f767f9e0@suse.de/T/#t
Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: 2fd001cd3600 ("arch: Rename fbdev header and source files")
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Cc: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arch@vger.kernel.org
Cc: linux-fbdev@vger.kernel.org
Cc: dri-devel@lists.freedesktop.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
| -rw-r--r-- | arch/sparc/video/Makefile | 2 | ||||
| -rw-r--r-- | arch/sparc/video/video-common.c (renamed from arch/sparc/video/video.c) | 0 | ||||
| -rw-r--r-- | arch/x86/video/Makefile | 2 | ||||
| -rw-r--r-- | arch/x86/video/video-common.c (renamed from arch/x86/video/video.c) | 0 |
4 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/video/Makefile b/arch/sparc/video/Makefile index fdf83a408d75..dcfbe7a5912c 100644 --- a/arch/sparc/video/Makefile +++ b/arch/sparc/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += video.o +obj-y += video-common.o diff --git a/arch/sparc/video/video.c b/arch/sparc/video/video-common.c index 2414380caadc..2414380caadc 100644 --- a/arch/sparc/video/video.c +++ b/arch/sparc/video/video-common.c diff --git a/arch/x86/video/Makefile b/arch/x86/video/Makefile index fdf83a408d75..dcfbe7a5912c 100644 --- a/arch/x86/video/Makefile +++ b/arch/x86/video/Makefile @@ -1,3 +1,3 @@ # SPDX-License-Identifier: GPL-2.0-only -obj-y += video.o +obj-y += video-common.o diff --git a/arch/x86/video/video.c b/arch/x86/video/video-common.c index 81fc97a2a837..81fc97a2a837 100644 --- a/arch/x86/video/video.c +++ b/arch/x86/video/video-common.c |