Commit 5241c2ca authored by Thomas Zimmermann's avatar Thomas Zimmermann Committed by Ard Biesheuvel
Browse files

firmware: efi: Never declare sysfb_primary_display on x86 



The x86 architecture comes with its own instance of the global
state variable sysfb_primary_display. Never declare it in the EFI
subsystem. Fix the test for CONFIG_FIRMWARE_EDID accordingly.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Fixes: e65ca164 ("efi: export sysfb_primary_display for EDID")
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
parent 217c0a5c

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