Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+1
-1
+1
-1
drivers/firmware/efi/efi-init.c
+1
-1
drivers/firmware/efi/efi-init.c
···
60
60
* x86 defines its own instance of sysfb_primary_display and uses
61
61
* it even without EFI, everything else can get them from here.
62
62
*/
63
-
#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON)) || defined(CONFIG_FIRMWARE_EDID)
63
+
#if !defined(CONFIG_X86) && (defined(CONFIG_SYSFB) || defined(CONFIG_EFI_EARLYCON) || defined(CONFIG_FIRMWARE_EDID))
64
64
struct sysfb_display_info sysfb_primary_display __section(".data");
65
65
EXPORT_SYMBOL_GPL(sysfb_primary_display);
66
66
#endif