diff options
| author |   Arvind Sankar <nivedita@alum.mit.edu> | 2019-12-18 16:45:01 -0500 |
|---|---|---|
| committer |   Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-14 15:29:18 +0100 |
| commit | c5ff734cf65e5bf667569076f143389c2b1fba24 (patch) | |
| tree | f381e170ea92ee591fca7d4ad9e7ca071717591e /arch/s390/kernel/setup.c | |
| parent | arch/riscv/setup: Drop dummy_con initialization (diff) | |
| download | linux-dev-c5ff734cf65e5bf667569076f143389c2b1fba24.tar.xz linux-dev-c5ff734cf65e5bf667569076f143389c2b1fba24.zip | |
arch/s390/setup: Drop dummy_con initialization
con_init in tty/vt.c will now set conswitchp to dummy_con if it's unset.
Drop it from arch setup code.
Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20191218214506.49252-20-nivedita@alum.mit.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/s390/kernel/setup.c')
| -rw-r--r-- | arch/s390/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/s390/kernel/setup.c b/arch/s390/kernel/setup.c index 9cbf490fd162..703cfbca2d25 100644 --- a/arch/s390/kernel/setup.c +++ b/arch/s390/kernel/setup.c @@ -241,8 +241,6 @@ static void __init conmode_default(void) SET_CONSOLE_SCLP; #endif } - if (IS_ENABLED(CONFIG_VT) && IS_ENABLED(CONFIG_DUMMY_CONSOLE)) - conswitchp = &dummy_con; } #ifdef CONFIG_CRASH_DUMP |