Commit acfc7882 authored by Arnd Bergmann's avatar Arnd Bergmann Committed by Greg Kroah-Hartman
Browse files

vgacon: remove screen_info dependency 



The vga console driver is fairly self-contained, and only used by
architectures that explicitly initialize the screen_info settings.

Chance every instance that picks the vga console by setting conswitchp
to call a function instead, and pass a reference to the screen_info
there.

Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Acked-by: default avatarKhalid Azzi <khalid@gonehiking.org>
Acked-by: default avatarHelge Deller <deller@gmx.de>
Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20231009211845.3136536-6-arnd@kernel.org


Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent fd90410e

arch/alpha/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -654,7 +654,7 @@ setup_arch(char **cmdline_p) 


#ifdef CONFIG_VT

#if defined(CONFIG_VGA_CONSOLE)

	conswitchp = &vga_con;

	vgacon_register_screen(&screen_info);

#endif

#endif

arch/arm/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1192,7 +1192,7 @@ void __init setup_arch(char **cmdline_p) 


#ifdef CONFIG_VT

#if defined(CONFIG_VGA_CONSOLE)

	conswitchp = &vga_con;

	vgacon_register_screen(&screen_info);

#endif

#endif

arch/ia64/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -619,7 +619,7 @@ setup_arch (char **cmdline_p) 
		 * memory so we can avoid this problem.

		 */

		if (efi_mem_type(0xA0000) != EFI_CONVENTIONAL_MEMORY)

			conswitchp = &vga_con;

			vgacon_register_screen(&screen_info);

# endif

	}

#endif

arch/mips/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ void __init setup_arch(char **cmdline_p) 


#if defined(CONFIG_VT)

#if defined(CONFIG_VGA_CONSOLE)

	conswitchp = &vga_con;

	vgacon_register_screen(&screen_info);

#endif

#endif

arch/x86/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ void __init setup_arch(char **cmdline_p) 
#ifdef CONFIG_VT

#if defined(CONFIG_VGA_CONSOLE)

	if (!efi_enabled(EFI_BOOT) || (efi_mem_type(0xa0000) != EFI_CONVENTIONAL_MEMORY))

		conswitchp = &vga_con;

		vgacon_register_screen(&screen_info);

#endif

#endif

	x86_init.oem.banner();