Merge tag 'armsoc-late' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[sfrench/cifs-2.6.git] / drivers / char / ttyprintk.c

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;
        }
 }