arch/arm64/setup: Drop dummy_con initialization
authorArvind Sankar <nivedita@alum.mit.edu>
Wed, 18 Dec 2019 21:44:48 +0000 (16:44 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 14 Jan 2020 14:29:15 +0000 (15:29 +0100)
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-7-nivedita@alum.mit.edu
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/arm64/kernel/setup.c

index 56f6645..2a86676 100644 (file)
@@ -353,9 +353,6 @@ void __init setup_arch(char **cmdline_p)
        init_task.thread_info.ttbr0 = __pa_symbol(empty_zero_page);
 #endif
 
-#ifdef CONFIG_VT
-       conswitchp = &dummy_con;
-#endif
        if (boot_args[1] || boot_args[2] || boot_args[3]) {
                pr_err("WARNING: x1-x3 nonzero in violation of boot protocol:\n"
                        "\tx1: %016llx\n\tx2: %016llx\n\tx3: %016llx\n"