vt: remove superfluous CONFIG_HW_CONSOLE
Subsystems (8)
PATCH 1/1 vt: remove superfluous CONFIG_HW_CONSOLE
The config HW_CONSOLE is always identical to the config VT and is not visible in the kernel's build menuconfig. So, CONFIG_HW_CONSOLE is redundant.
Replace all references to CONFIG_HW_CONSOLE with CONFIG_VT and remove CONFIG_HW_CONSOLE.
---
I think this patch is best picked up by Greg rather than splitting it in smaller pieces for m68k, amiga keyboard, fbdev etc.
Greg, if that is fine, could you pick this for the next merge window?
I was also considering to rename config VT_HW_CONSOLE_BINDING to VT_CONSOLE_BINDING, as the dependency is on VT, not HW_CONSOLE, but at the moment, that seemed more churn than value of clarification.
arch/m68k/amiga/config.c | 2 +- drivers/input/keyboard/amikbd.c | 6 +++--- drivers/tty/Kconfig | 7 +------ drivers/tty/vt/Makefile | 4 ++-- drivers/video/fbdev/tgafb.c | 2 +- include/linux/console.h | 2 +- lib/Kconfig.kgdb | 2 +- 7 files changed, 10 insertions(+), 15 deletions(-)
arch/m68k/amiga/config.c +1 -1
@@ -846,6 +846,6 @@ static void amiga_get_hardware_list(struct seq_file *m)* The Amiga keyboard driver needs key_maps, but we cannot export it in * drivers/char/defkeymap.c, as it is autogenerated */ -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT EXPORT_SYMBOL_GPL (key_maps);#endif
drivers/input/keyboard/amikbd.c +3 -3
@@ -26,7 +26,7 @@ MODULE_AUTHOR("Vojtech Pavlik <[email protected]>");MODULE_DESCRIPTION ("Amiga keyboard driver" );MODULE_LICENSE ("GPL" ); -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT static unsigned char amikbd_keycode[0x78 ]__initdata = { [0 ] =KEY_GRAVE , [1] = KEY_1,
@@ -148,9 +148,9 @@ static void __init amikbd_init_console_keymaps(void) memcpy(key_maps[i], temp_map, sizeof(temp_map)); } } -#else /* !CONFIG_HW_CONSOLE */ +#else /* !CONFIG_VT */ static inline void amikbd_init_console_keymaps (void ) {} -#endif /* !CONFIG_HW_CONSOLE */ +#endif /* !CONFIG_VT */ static const char *amikbd_messages[8 ] = { [0 ] =KERN_ALERT "amikbd: Ctrl-Amiga-Amiga reset warning!!\n" ,
drivers/tty/Kconfig +1 -6
@@ -75,14 +75,9 @@ config VT_CONSOLE_SLEEP def_bool y depends on VT_CONSOLE && PM_SLEEP -config HW_CONSOLE - bool - depends on VT - default y - config VT_HW_CONSOLE_BINDING bool "Support for binding and unbinding console drivers" - depends on HW_CONSOLE + depends on VT help The virtual terminal is the device that interacts with the physical terminal through console drivers. On these systems, at least one
drivers/tty/vt/Makefile +2 -2
@@ -5,9 +5,9 @@ FONTMAPFILE = cp437.uni obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o \ - selection.o keyboard.o + selection.o keyboard.o \ + vt.o defkeymap.o obj-$(CONFIG_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o -obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o # Files generated that shall be removed upon make clean clean-files := consolemap_deftbl.c defkeymap.c
drivers/video/fbdev/tgafb.c +1 -1
@@ -380,7 +380,7 @@ tgafb_set_par(struct fb_info *info)BT463_LOAD_ADDR (par,0x0000 );TGA_WRITE_REG (par,BT463_PALETTE <<2 ,TGA_RAMDAC_SETUP_REG ); -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT for (i =0 ; i <16 ; i++) {int j = color_table[i];
include/linux/console.h +1 -1
@@ -112,7 +112,7 @@ int con_is_bound(const struct consw *csw);int do_unregister_con_driver (const struct consw *csw);int do_take_over_console (const struct consw *sw,int first,int last,int deflt);void give_up_console (const struct consw *sw); -#ifdef CONFIG_HW_CONSOLE +#ifdef CONFIG_VT int con_debug_enter (struct vc_data *vc);int con_debug_leave (void );#else
lib/Kconfig.kgdb +1 -1
@@ -43,7 +43,7 @@ config KGDB_SERIAL_CONSOLE tristate "KGDB: use kgdb over the serial console" select CONSOLE_POLL select MAGIC_SYSRQ - depends on TTY && HW_CONSOLE + depends on TTY && VT default y help Share a serial console with kgdb. Sysrq-g must be used
Signature · 1 line
2.17.1
Greg Kroah-Hartman
maintainerQuoted 7 lines · Lukas Bulwahn
The config
HW_CONSOLEis always identical to the config VT and is not visible in the kernel's build menuconfig. So,CONFIG_HW_CONSOLEis redundant.Replace all references to
CONFIG_HW_CONSOLEwithCONFIG_VTand removeCONFIG_HW_CONSOLE.
Quoted 6 lines
Signed-off-by Lukas Bulwahn <[email protected]>---
I think this patch is best picked up by Greg rather than splitting it in smaller pieces for m68k, amiga keyboard, fbdev etc.Greg, if that is fine, could you pick this for the next merge window?
Yes, the "next" one, it's too late for 6.8-rc1, sorry.
I'll look at it after -rc1 is out.
thanks,
greg k-h
Quoted 8 lines · Lukas Bulwahn
The config
HW_CONSOLEis always identical to the config VT and is not visible in the kernel's build menuconfig. So,CONFIG_HW_CONSOLEis redundant.Replace all references to
CONFIG_HW_CONSOLEwithCONFIG_VTand removeCONFIG_HW_CONSOLE.Signed-off-by Lukas Bulwahn <[email protected]>
Quoted 1 line
arch/m68k/amiga/config.c | 2 +-
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Lukas Bulwahn <[email protected]> writes:
Hello Lukas,
Quoted 9 lines
The config
HW_CONSOLEis always identical to the config VT and is not visible in the kernel's build menuconfig. So,CONFIG_HW_CONSOLEis redundant.Replace all references to
CONFIG_HW_CONSOLEwithCONFIG_VTand removeCONFIG_HW_CONSOLE.Signed-off-by Lukas Bulwahn <[email protected]>---
Makes sense to me.
Signature · 5 lines
Best regards, Javier Martinez Canillas Core Platforms Red Hat
Quoted 12 lines · Lukas Bulwahn
The config
HW_CONSOLEis always identical to the config VT and is not visible in the kernel's build menuconfig. So,CONFIG_HW_CONSOLEis redundant.Replace all references to
CONFIG_HW_CONSOLEwithCONFIG_VTand removeCONFIG_HW_CONSOLE.Signed-off-by Lukas Bulwahn <[email protected]>---
I think this patch is best picked up by Greg rather than splitting it in smaller pieces for m68k, amiga keyboard, fbdev etc.
Quoted 8 lines
Greg, if that is fine, could you pick this for the next merge window?
I was also considering to rename config
VT_HW_CONSOLE_BINDINGtoVT_CONSOLE_BINDING, as the dependency is on VT, notHW_CONSOLE, but at the moment, that seemed more churn than value of clarification.arch/m68k/amiga/config.c | 2 +- drivers/input/keyboard/amikbd.c | 6 +++---
Thanks.
Signature · 1 line
Dmitry