From: Arvind Sankar <nivedita@alum.mit.edu>
Date: Wed, 18 Dec 2019 21:44:56 +0000 (-0500)
Subject: arch/nios2/setup: Drop dummy_con initialization
X-Git-Tag: v5.6-rc1~139^2~24
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=701250223c67bfdc0252961d6536f51bc28c2f81;p=users%2Fwilly%2Fxarray.git

arch/nios2/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-15-nivedita@alum.mit.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c
index 4cf35b09c0ec..3c6e3c813a0b 100644
--- a/arch/nios2/kernel/setup.c
+++ b/arch/nios2/kernel/setup.c
@@ -196,8 +196,4 @@ void __init setup_arch(char **cmdline_p)
 	 * get kmalloc into gear
 	 */
 	paging_init();
-
-#if defined(CONFIG_VT) && defined(CONFIG_DUMMY_CONSOLE)
-	conswitchp = &dummy_con;
-#endif
 }