[PATCH] disable early console in console_init

x86-64 has an early console implementation which runs before the normal
console is initialized. To avoid duplicated output it needs to be
disabled when the real console starts. This patch adds an function call
for that to the appropiate part of console_init.

diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
index c745940468b81124fa0fa6cb6db99734cc96626b..3eb86b8e4b66750d8394396809f9424b5fd0980e 100644 (file)
--- a/drivers/char/tty_io.c
+++ b/drivers/char/tty_io.c
@@ -121,6 +121,8 @@ extern struct tty_driver ptm_driver[];      /* Unix98 pty masters; for /dev/ptmx */
 extern struct tty_driver pts_driver[]; /* Unix98 pty slaves;  for /dev/ptmx */
 #endif
 
+extern void disable_early_printk(void);
+
 /*
  * redirect is the pseudo-tty that console output
  * is redirected to if asked by TIOCCONS.
@@ -2185,6 +2187,9 @@ void __init console_init(void)
         * set up the console device so that later boot sequences can 
         * inform about problems etc..
         */
+#ifdef CONFIG_EARLY_PRINTK
+       disable_early_printk();
+#endif
 #ifdef CONFIG_VT
        con_init();
 #endif