X-Git-Url: http://git.monstr.eu/?a=blobdiff_plain;f=kernel%2Fprintk%2Fprintk.c;h=ac440b879a2cfc2f52415de47396fca62a601e38;hb=3cffa06aeef7ece30f6b5ac0ea51f264e8fea4d0;hp=fe64a49344bf5231fbc80fc8f8a26d714accbe07;hpb=bf36c6b946c8895cf590f10dbd70b589b0dc101f;p=linux-2.6-microblaze.git

diff --git a/kernel/printk/printk.c b/kernel/printk/printk.c
index fe64a49344bf..ac440b879a2c 100644
--- a/kernel/printk/printk.c
+++ b/kernel/printk/printk.c
@@ -2189,8 +2189,15 @@ static int __init console_setup(char *str)
 	char *s, *options, *brl_options = NULL;
 	int idx;
 
-	if (str[0] == 0)
+	/*
+	 * console="" or console=null have been suggested as a way to
+	 * disable console output. Use ttynull that has been created
+	 * for exacly this purpose.
+	 */
+	if (str[0] == 0 || strcmp(str, "null") == 0) {
+		__add_preferred_console("ttynull", 0, NULL, NULL, true);
 		return 1;
+	}
 
 	if (_braille_console_setup(&str, &brl_options))
 		return 1;