firmware: efi: Never declare sysfb_primary_display on x86

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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: Thomas Zimmermann <tzimmermann@suse.de>
Fixes: e65ca1646311 ("efi: export sysfb_primary_display for EDID")
Signed-off-by: Ard Biesheuvel <ardb@kernel.org>

authored by

Thomas Zimmermann and committed by

Ard Biesheuvel 1 week ago 5241c2ca 217c0a5c

+1 -1

1 changed file

expand all

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