1 files changed, 5 insertions, 15 deletions

diff --git a/arch/x86_64/kernel/early_printk.c b/arch/x86_64/kernel/early_printk.c
index 92213d2b7c11..56eaa259782b 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -243,22 +243,12 @@ static int __init setup_early_printk(char *buf)
                 early_console = &simnow_console;
                 keep_early = 1;
         }
+
+        if (keep_early)
+                early_console->flags &= ~CON_BOOT;
+        else
+                early_console->flags |= CON_BOOT;
         register_console(early_console);
         return 0;
 }
-
 early_param("earlyprintk", setup_early_printk);
-
-void __init disable_early_printk(void)
-{
-        if (!early_console_initialized || !early_console)
-                return;
-        if (!keep_early) {
-                printk("disabling early console\n");
-                unregister_console(early_console);
-                early_console_initialized = 0;
-        } else {
-                printk("keeping early console\n");
-        }
-}
-