diff options
| author | Arvind Sankar <nivedita@alum.mit.edu> | 2019-12-18 16:45:03 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-01-14 15:29:18 +0100 |
| commit | 2f01bfc1ecfba5381e788d59df10f05c542b494e (patch) | |
| tree | eafee72088e05a434101effa18079858d202f1e1 | |
| parent | 40b19e316294e8fd466c0328be607a042e7ec95b (diff) | |
| download | linux-2f01bfc1ecfba5381e788d59df10f05c542b494e.tar.gz linux-2f01bfc1ecfba5381e788d59df10f05c542b494e.tar.bz2 linux-2f01bfc1ecfba5381e788d59df10f05c542b494e.zip | |
arch/sparc/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-22-nivedita@alum.mit.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/sparc/kernel/setup_32.c | 4 | ||||
| -rw-r--r-- | arch/sparc/kernel/setup_64.c | 4 |
2 files changed, 0 insertions, 8 deletions
diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index afe1592a6d08..5d1bcfce05d8 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -332,10 +332,6 @@ void __init setup_arch(char **cmdline_p) break; } -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif - idprom_init(); load_mmu(); diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index fd2182a5c32d..75e3992203b6 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -653,10 +653,6 @@ void __init setup_arch(char **cmdline_p) else pr_info("ARCH: SUN4U\n"); -#ifdef CONFIG_DUMMY_CONSOLE - conswitchp = &dummy_con; -#endif - idprom_init(); if (!root_flags) |