diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2026-04-09 21:21:21 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2026-04-09 21:21:21 +0300 |
| commit | b42ed3bb884e6b399b46d19df3f5cf015a79c804 (patch) | |
| tree | 7af7291738d0f84e75867e428aa15c3c8fb1c28a /drivers | |
| parent | bb2ea74eeb6735eed29bd74695f90f0e5af09f5c (diff) | |
| parent | 5241c2ca33bb181bf7abb7cb4bba1cc67d1b6278 (diff) | |
| download | linux-b42ed3bb884e6b399b46d19df3f5cf015a79c804.tar.xz | |
Merge tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi
Pull EFI fix from Ard Biesheuvel:
"Fix an incorrect preprocessor conditional that may result in duplicate
instances of sysfb_primary_display on x86"
* tag 'efi-fixes-for-v7.0-4' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi:
firmware: efi: Never declare sysfb_primary_display on x86
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/efi-init.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/firmware/efi/efi-init.c b/drivers/firmware/efi/efi-init.c index 5a595d026f58..6103b1a082d2 100644 --- a/drivers/firmware/efi/efi-init.c +++ b/drivers/firmware/efi/efi-init.c @@ -60,7 +60,7 @@ extern __weak const efi_config_table_type_t efi_arch_tables[]; * x86 defines its own instance of sysfb_primary_display and uses * it even without EFI, everything else can get them from here. */ -#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON)) || defined(CONFIG_FIRMWARE_EDID) +#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_FIRMWARE_EDID)) struct sysfb_display_info sysfb_primary_display __section(".data"); EXPORT_SYMBOL_GPL(sysfb_primary_display); #endif |