2 files changed, 13 insertions, 1 deletions

diff --git a/kernel/printk.c b/kernel/printk.c
index bd2cd06287..8451dfc31d 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -1083,6 +1083,19 @@ int unregister_console(struct console *console)
 }
 EXPORT_SYMBOL(unregister_console);
 
+static int __init disable_boot_consoles(void)
+{
+        if (console_drivers != NULL) {
+                if (console_drivers->flags & CON_BOOT) {
+                        printk(KERN_INFO "turn off boot console %s%d\n",
+                                console_drivers->name, console_drivers->index);
+                        return unregister_console(console_drivers);
+                }
+        }
+        return 0;
+}
+late_initcall(disable_boot_consoles);
+
 /**
  * tty_write_message - write a message to a certain tty, not just the console.
  * @tty: the destination tty_struct
diff --git a/kernel/sysctl.c b/kernel/sysctl.c
index 8bdb8c07e0..9029690f4f 100644
--- a/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@ -27,7 +27,6 @@
 #include <linux/capability.h>
 #include <linux/ctype.h>
 #include <linux/utsname.h>
-#include <linux/capability.h>
 #include <linux/smp_lock.h>
 #include <linux/fs.h>
 #include <linux/init.h>