Commit 805ece2a authored by Arvind Sankar's avatar Arvind Sankar Committed by Greg Kroah-Hartman

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: default avatarArvind Sankar <nivedita@alum.mit.edu>
Link: https://lore.kernel.org/r/20191218214506.49252-3-nivedita@alum.mit.eduSigned-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e018bc28
...@@ -3326,8 +3326,9 @@ static int __init con_init(void) ...@@ -3326,8 +3326,9 @@ static int __init con_init(void)
console_lock(); console_lock();
if (conswitchp) if (!conswitchp)
display_desc = conswitchp->con_startup(); conswitchp = &dummy_con;
display_desc = conswitchp->con_startup();
if (!display_desc) { if (!display_desc) {
fg_console = 0; fg_console = 0;
console_unlock(); console_unlock();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment