Skip to content

Commit ca9b5b6

Browse files
torvaldstorvalds
committed
Merge tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
Pull tty/serial driver updates from Greg KH: "Here are the big set of tty and serial driver updates for 5.6-rc1 Included in here are: - dummy_con cleanups (touches lots of arch code) - sysrq logic cleanups (touches lots of serial drivers) - samsung driver fixes (wasn't really being built) - conmakeshash move to tty subdir out of scripts - lots of small tty/serial driver updates All of these have been in linux-next for a while with no reported issues" * tag 'tty-5.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty: (140 commits) tty: n_hdlc: Use flexible-array member and struct_size() helper tty: baudrate: SPARC supports few more baud rates tty: baudrate: Synchronise baud_table[] and baud_bits[] tty: serial: meson_uart: Add support for kernel debugger serial: imx: fix a race condition in receive path serial: 8250_bcm2835aux: Document struct bcm2835aux_data serial: 8250_bcm2835aux: Use generic remapping code serial: 8250_bcm2835aux: Allocate uart_8250_port on stack serial: 8250_bcm2835aux: Suppress register_port error on -EPROBE_DEFER serial: 8250_bcm2835aux: Suppress clk_get error on -EPROBE_DEFER serial: 8250_bcm2835aux: Fix line mismatch on driver unbind serial_core: Remove unused member in uart_port vt: Correct comment documenting do_take_over_console() vt: Delete comment referencing non-existent unbind_con_driver() arch/xtensa/setup: Drop dummy_con initialization arch/x86/setup: Drop dummy_con initialization arch/unicore32/setup: Drop dummy_con initialization arch/sparc/setup: Drop dummy_con initialization arch/sh/setup: Drop dummy_con initialization arch/s390/setup: Drop dummy_con initialization ...
2 parents aac9662 + 85f4c95 commit ca9b5b6

File tree

106 files changed

+824
-934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

106 files changed

+824
-934
lines changed

‎MAINTAINERS

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6181,6 +6181,12 @@ M: Maxim Levitsky <[email protected]>
61816181
S: Maintained
61826182
F: drivers/media/rc/ene_ir.*
61836183

6184+
EPAPR HYPERVISOR BYTE CHANNEL DEVICE DRIVER
6185+
M: Laurentiu Tudor <[email protected]>
6186+
L: [email protected]
6187+
S: Maintained
6188+
F: drivers/tty/ehv_bytechan.c
6189+
61846190
EPSON S1D13XXX FRAMEBUFFER DRIVER
61856191
M: Kristoffer Ericson <[email protected]>
61866192
S: Maintained

‎arch/alpha/kernel/setup.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -655,8 +655,6 @@ setup_arch(char **cmdline_p)
655655
#ifdef CONFIG_VT
656656
#if defined(CONFIG_VGA_CONSOLE)
657657
conswitchp = &vga_con;
658-
#elif defined(CONFIG_DUMMY_CONSOLE)
659-
conswitchp = &dummy_con;
660658
#endif
661659
#endif
662660

‎arch/arc/kernel/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,10 +572,6 @@ void __init setup_arch(char **cmdline_p)
572572
*/
573573
root_mountflags &= ~MS_RDONLY;
574574

575-
#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
576-
conswitchp = &dummy_con;
577-
#endif
578-
579575
arc_unwind_init();
580576
}
581577

‎arch/arm/kernel/setup.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1164,8 +1164,6 @@ void __init setup_arch(char **cmdline_p)
11641164
#ifdef CONFIG_VT
11651165
#if defined(CONFIG_VGA_CONSOLE)
11661166
conswitchp = &vga_con;
1167-
#elif defined(CONFIG_DUMMY_CONSOLE)
1168-
conswitchp = &dummy_con;
11691167
#endif
11701168
#endif
11711169

‎arch/arm64/kernel/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -360,9 +360,6 @@ void __init setup_arch(char **cmdline_p)
360360
init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page);
361361
#endif
362362

363-
#ifdef CONFIG_VT
364-
conswitchp = &dummy_con;
365-
#endif
366363
if (boot_args[1] || boot_args[2] || boot_args[3]) {
367364
pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n"
368365
"\tx1: %016llx\n\tx2: %016llx\n\tx3: %016llx\n"

‎arch/csky/kernel/setup.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -136,10 +136,6 @@ void __init setup_arch(char **cmdline_p)
136136
#ifdef CONFIG_HIGHMEM
137137
kmap_init();
138138
#endif
139-
140-
#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
141-
conswitchp = &dummy_con;
142-
#endif
143139
}
144140

145141
unsigned long va_pa_offset;

‎arch/ia64/kernel/setup.c

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -608,9 +608,6 @@ setup_arch (char **cmdline_p)
608608

609609
#ifdef CONFIG_VT
610610
if (!conswitchp) {
611-
# if defined(CONFIG_DUMMY_CONSOLE)
612-
conswitchp = &dummy_con;
613-
# endif
614611
# if defined(CONFIG_VGA_CONSOLE)
615612
/*
616613
* Non-legacy systems may route legacy VGA MMIO range to system

‎arch/m68k/kernel/setup_mm.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -274,10 +274,6 @@ void __init setup_arch(char **cmdline_p)
274274

275275
parse_early_param();
276276

277-
#ifdef CONFIG_DUMMY_CONSOLE
278-
conswitchp = &dummy_con;
279-
#endif
280-
281277
switch (m68k_machtype) {
282278
#ifdef CONFIG_AMIGA
283279
case MACH_AMIGA:

‎arch/m68k/kernel/setup_no.c

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -146,10 +146,6 @@ void __init setup_arch(char **cmdline_p)
146146
memcpy(boot_command_line, command_line, COMMAND_LINE_SIZE);
147147
boot_command_line[COMMAND_LINE_SIZE-1] = 0;
148148

149-
#if defined(CONFIG_FRAMEBUFFER_CONSOLE) && defined(CONFIG_DUMMY_CONSOLE)
150-
conswitchp = &dummy_con;
151-
#endif
152-
153149
/*
154150
* Give all the memory to the bootmap allocator, tell it to put the
155151
* boot mem_map at the start of memory.

‎arch/m68k/sun3x/config.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@ void __init config_sun3x(void)
7070
break;
7171
default:
7272
serial_console = 0;
73-
conswitchp = &dummy_con;
7473
break;
7574
}
7675
#endif

0 commit comments

Comments
 (0)