vt: Initialize conswitchp to dummy_con if unset

If the arch setup code hasn't initialized conswitchp yet, set it to
dummy_con in con_init. This will allow us to drop the dummy_con
initialization that's done in almost every architecture.

Signed-off-by: Arvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20191218214506.49252-3-nivedita@alum.mit.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 34aa39d1aed9f4d8a3f5f4e31bf615b67cc6b505..2456afaf1c618c8e646cd2b8ed5c80576b101ab0 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -3326,8 +3326,9 @@ static int __init con_init(void)
 
        console_lock();
 
-       if (conswitchp)
-               display_desc = conswitchp->con_startup();
+       if (!conswitchp)
+               conswitchp = &dummy_con;
+       display_desc = conswitchp->con_startup();
        if (!display_desc) {
                fg_console = 0;
                console_unlock();