mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

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.

Signed-off-by: Lukas Bulwahn <lukas.bulwahn@gmail.com>
Reviewed-by: Javier Martinez Canillas <javierm@redhat.com>
Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20240108134102.601-1-lukas.bulwahn@gmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Lukas Bulwahn 2024-01-08 14:41:02 +01:00 committed by Greg Kroah-Hartman
parent 9e957a1550
commit 5c49b6a4a4
7 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/m68k/amiga/config.c
View File

@ -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 * The Amiga keyboard driver needs key_maps, but we cannot export it in
* drivers/char/defkeymap.c, as it is autogenerated * drivers/char/defkeymap.c, as it is autogenerated
*/ */
#ifdef CONFIG_HW_CONSOLE #ifdef CONFIG_VT
EXPORT_SYMBOL_GPL(key_maps); EXPORT_SYMBOL_GPL(key_maps);
#endif #endif

6
drivers/input/keyboard/amikbd.c
View File

@ -26,7 +26,7 @@ MODULE_AUTHOR("Vojtech Pavlik <vojtech@ucw.cz>");
MODULE_DESCRIPTION("Amiga keyboard driver"); MODULE_DESCRIPTION("Amiga keyboard driver");
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
#ifdef CONFIG_HW_CONSOLE #ifdef CONFIG_VT
static unsigned char amikbd_keycode[0x78] __initdata = { static unsigned char amikbd_keycode[0x78] __initdata = {
[0] = KEY_GRAVE, [0] = KEY_GRAVE,
[1] = KEY_1, [1] = KEY_1,
@ -148,9 +148,9 @@ static void __init amikbd_init_console_keymaps(void)
memcpy(key_maps[i], temp_map, sizeof(temp_map)); memcpy(key_maps[i], temp_map, sizeof(temp_map));
} }
} }
#else /* !CONFIG_HW_CONSOLE */ #else /* !CONFIG_VT */
static inline void amikbd_init_console_keymaps(void) {} static inline void amikbd_init_console_keymaps(void) {}
#endif /* !CONFIG_HW_CONSOLE */ #endif /* !CONFIG_VT */
static const char *amikbd_messages[8] = { static const char *amikbd_messages[8] = {
[0] = KERN_ALERT "amikbd: Ctrl-Amiga-Amiga reset warning!!\n", [0] = KERN_ALERT "amikbd: Ctrl-Amiga-Amiga reset warning!!\n",

7
drivers/tty/Kconfig
View File

@ -75,14 +75,9 @@ config VT_CONSOLE_SLEEP
def_bool y def_bool y
depends on VT_CONSOLE && PM_SLEEP depends on VT_CONSOLE && PM_SLEEP
config HW_CONSOLE
bool
depends on VT
default y
config VT_HW_CONSOLE_BINDING config VT_HW_CONSOLE_BINDING
bool "Support for binding and unbinding console drivers" bool "Support for binding and unbinding console drivers"
depends on HW_CONSOLE depends on VT
help help
The virtual terminal is the device that interacts with the physical The virtual terminal is the device that interacts with the physical
terminal through console drivers. On these systems, at least one terminal through console drivers. On these systems, at least one

4
drivers/tty/vt/Makefile
View File

@ -5,9 +5,9 @@
FONTMAPFILE = cp437.uni FONTMAPFILE = cp437.uni
obj-$(CONFIG_VT) += vt_ioctl.o vc_screen.o \ 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_CONSOLE_TRANSLATIONS) += consolemap.o consolemap_deftbl.o
obj-$(CONFIG_HW_CONSOLE) += vt.o defkeymap.o
# Files generated that shall be removed upon make clean # Files generated that shall be removed upon make clean
clean-files := consolemap_deftbl.c defkeymap.c clean-files := consolemap_deftbl.c defkeymap.c

2
drivers/video/fbdev/tgafb.c
View File

@ -380,7 +380,7 @@ tgafb_set_par(struct fb_info *info)
BT463_LOAD_ADDR(par, 0x0000); BT463_LOAD_ADDR(par, 0x0000);
TGA_WRITE_REG(par, BT463_PALETTE << 2, TGA_RAMDAC_SETUP_REG); TGA_WRITE_REG(par, BT463_PALETTE << 2, TGA_RAMDAC_SETUP_REG);
#ifdef CONFIG_HW_CONSOLE #ifdef CONFIG_VT
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
int j = color_table[i]; int j = color_table[i];

2
include/linux/console.h
View File

@ -141,7 +141,7 @@ int con_is_bound(const struct consw *csw);
int do_unregister_con_driver(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); int do_take_over_console(const struct consw *sw, int first, int last, int deflt);
void give_up_console(const struct consw *sw); void give_up_console(const struct consw *sw);
#ifdef CONFIG_HW_CONSOLE #ifdef CONFIG_VT
void con_debug_enter(struct vc_data *vc); void con_debug_enter(struct vc_data *vc);
void con_debug_leave(void); void con_debug_leave(void);
#else #else

2
lib/Kconfig.kgdb
View File

@ -43,7 +43,7 @@ config KGDB_SERIAL_CONSOLE
tristate "KGDB: use kgdb over the serial console" tristate "KGDB: use kgdb over the serial console"
select CONSOLE_POLL select CONSOLE_POLL
select MAGIC_SYSRQ select MAGIC_SYSRQ
depends on TTY && HW_CONSOLE depends on TTY && VT
default y default y
help help
Share a serial console with kgdb. Sysrq-g must be used Share a serial console with kgdb. Sysrq-g must be used