ttyprintk: make the printk log level configurable

For some use cases it is handy to use a different printk log level than the
default (info) for the messages written to ttyprintk, so add a Kconfig
option similar to what we have for default console loglevel.

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/char/Kconfig b/drivers/char/Kconfig
index 9d03b2ff5df6a852b86862a5213c7c739bdf4a46..2e2ffe7010aaa2076e9d0ae27ff38e43b57db5fa 100644 (file)
--- a/drivers/char/Kconfig
+++ b/drivers/char/Kconfig
@@ -66,6 +66,14 @@ config TTY_PRINTK
 
          If unsure, say N.
 
+config TTY_PRINTK_LEVEL
+       depends on TTY_PRINTK
+       int "ttyprintk log level (1-7)"
+       range 1 7
+       default "6"
+       help
+         Printk log level to use for ttyprintk messages.
+
 config PRINTER
        tristate "Parallel printer support"
        depends on PARPORT

diff --git a/drivers/char/ttyprintk.c b/drivers/char/ttyprintk.c
index 67549ce88cc94251ad43e40074c7156f2736ea79..88808dbba48657adf70d8e998e0ea87fd6b05620 100644 (file)
--- a/drivers/char/ttyprintk.c
+++ b/drivers/char/ttyprintk.c
@@ -37,6 +37,8 @@ static struct ttyprintk_port tpk_port;
  */
 #define TPK_STR_SIZE 508 /* should be bigger then max expected line length */
 #define TPK_MAX_ROOM 4096 /* we could assume 4K for instance */
+#define TPK_PREFIX KERN_SOH __stringify(CONFIG_TTY_PRINTK_LEVEL)
+
 static int tpk_curr;
 
 static char tpk_buffer[TPK_STR_SIZE + 4];
@@ -45,7 +47,7 @@ static void tpk_flush(void)
 {
        if (tpk_curr > 0) {
                tpk_buffer[tpk_curr] = '\0';
-               pr_info("[U] %s\n", tpk_buffer);
+               printk(TPK_PREFIX "[U] %s\n", tpk_buffer);
                tpk_curr = 0;
        }
 }