Commit b42ed3bb authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents bb2ea74e 5241c2ca

drivers/firmware/efi/efi-init.c

+1 −1
Original line number Diff line number Diff line
@@ -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