All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mandeep Singh Baines <msb@chromium.org>
To: Greg KH <greg@kroah.com>
Cc: gregkh@suse.de, rjw@sisk.pl, mingo@redhat.com,
	akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	linux-pm@lists.linux-foundation.org,
	linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v2] TTY: use appropriate printk priority level
Date: Sun, 6 Feb 2011 09:31:53 -0800	[thread overview]
Message-ID: <20110206173153.GT19745@google.com> (raw)
In-Reply-To: <20110203221346.GA477@kroah.com>

Rebased to apply cleanly against v2.6.38-rc3

---
printk()s without a priority level default to KERN_WARNING. To reduce
noise at KERN_WARNING, this patch set the priority level appriopriately
for unleveled printks()s. This should be useful to folks that look at
dmesg warnings closely.

Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
---
 drivers/tty/vt/vt.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 147ede3..d5669ff 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2157,10 +2157,10 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 
 	currcons = vc->vc_num;
 	if (!vc_cons_allocated(currcons)) {
-	    /* could this happen? */
-		printk_once("con_write: tty %d not allocated\n", currcons+1);
-	    console_unlock();
-	    return 0;
+		/* could this happen? */
+		pr_warn_once("con_write: tty %d not allocated\n", currcons+1);
+		console_unlock();
+		return 0;
 	}
 
 	himask = vc->vc_hi_font_mask;
@@ -2940,7 +2940,7 @@ static int __init con_init(void)
 	gotoxy(vc, vc->vc_x, vc->vc_y);
 	csi_J(vc, 0);
 	update_screen(vc);
-	printk("Console: %s %s %dx%d",
+	pr_info("Console: %s %s %dx%d",
 		vc->vc_can_do_color ? "colour" : "mono",
 		display_desc, vc->vc_cols, vc->vc_rows);
 	printable = 1;
@@ -3103,7 +3103,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 			clear_buffer_attributes(vc);
 	}
 
-	printk("Console: switching ");
+	pr_info("Console: switching ");
 	if (!deflt)
 		printk("consoles %d-%d ", first+1, last+1);
 	if (j >= 0) {
@@ -3809,7 +3809,8 @@ void do_unblank_screen(int leaving_gfx)
 		return;
 	if (!vc_cons_allocated(fg_console)) {
 		/* impossible */
-		printk("unblank_screen: tty %d not allocated ??\n", fg_console+1);
+		pr_warning("unblank_screen: tty %d not allocated ??\n",
+			   fg_console+1);
 		return;
 	}
 	vc = vc_cons[fg_console].d;
-- 
1.7.3.1


WARNING: multiple messages have this Message-ID (diff)
From: Mandeep Singh Baines <msb@chromium.org>
To: Greg KH <greg@kroah.com>
Cc: gregkh@suse.de, rjw@sisk.pl, mingo@redhat.com,
	akpm@linux-foundation.org, linux-kernel@vger.kernel.org,
	linux-pm@lists.linux-foundation.org,
	linux-fsdevel@vger.kernel.org, linux-mm@kvack.org
Subject: [PATCH v2] TTY: use appropriate printk priority level
Date: Sun, 6 Feb 2011 09:31:53 -0800	[thread overview]
Message-ID: <20110206173153.GT19745@google.com> (raw)
In-Reply-To: <20110203221346.GA477@kroah.com>

Rebased to apply cleanly against v2.6.38-rc3

---
printk()s without a priority level default to KERN_WARNING. To reduce
noise at KERN_WARNING, this patch set the priority level appriopriately
for unleveled printks()s. This should be useful to folks that look at
dmesg warnings closely.

Signed-off-by: Mandeep Singh Baines <msb@chromium.org>
---
 drivers/tty/vt/vt.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 147ede3..d5669ff 100644
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -2157,10 +2157,10 @@ static int do_con_write(struct tty_struct *tty, const unsigned char *buf, int co
 
 	currcons = vc->vc_num;
 	if (!vc_cons_allocated(currcons)) {
-	    /* could this happen? */
-		printk_once("con_write: tty %d not allocated\n", currcons+1);
-	    console_unlock();
-	    return 0;
+		/* could this happen? */
+		pr_warn_once("con_write: tty %d not allocated\n", currcons+1);
+		console_unlock();
+		return 0;
 	}
 
 	himask = vc->vc_hi_font_mask;
@@ -2940,7 +2940,7 @@ static int __init con_init(void)
 	gotoxy(vc, vc->vc_x, vc->vc_y);
 	csi_J(vc, 0);
 	update_screen(vc);
-	printk("Console: %s %s %dx%d",
+	pr_info("Console: %s %s %dx%d",
 		vc->vc_can_do_color ? "colour" : "mono",
 		display_desc, vc->vc_cols, vc->vc_rows);
 	printable = 1;
@@ -3103,7 +3103,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
 			clear_buffer_attributes(vc);
 	}
 
-	printk("Console: switching ");
+	pr_info("Console: switching ");
 	if (!deflt)
 		printk("consoles %d-%d ", first+1, last+1);
 	if (j >= 0) {
@@ -3809,7 +3809,8 @@ void do_unblank_screen(int leaving_gfx)
 		return;
 	if (!vc_cons_allocated(fg_console)) {
 		/* impossible */
-		printk("unblank_screen: tty %d not allocated ??\n", fg_console+1);
+		pr_warning("unblank_screen: tty %d not allocated ??\n",
+			   fg_console+1);
 		return;
 	}
 	vc = vc_cons[fg_console].d;
-- 
1.7.3.1

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@kvack.org.  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>

  parent reply	other threads:[~2011-02-06 17:32 UTC|newest]

Thread overview: 57+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-01-25 23:57 [PATCH] printk: allow setting DEFAULT_MESSAGE_LEVEL via Kconfig Mandeep Singh Baines
2011-01-26  0:40 ` Joe Perches
2011-01-26  1:01   ` Mandeep Singh Baines
2011-01-26  1:15     ` Joe Perches
2011-01-26  4:18 ` WANG Cong
2011-01-26 23:05   ` Mandeep Baines
2011-01-27  5:49     ` WANG Cong
2011-01-26 22:49 ` Andrew Morton
2011-01-26 22:57   ` Randy Dunlap
2011-01-26 23:10     ` Andrew Morton
2011-01-27  7:26       ` WANG Cong
2011-01-27  8:27       ` Alexey Dobriyan
2011-01-27 15:57         ` Mandeep Singh Baines
2011-01-27 20:45           ` Ryan Mallon
2011-01-27 20:53             ` Alexey Dobriyan
2011-01-27 20:57               ` Ryan Mallon
2011-01-26 23:29 ` [PATCH v1 0/6] Set printk priority level Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines
2011-01-27  7:22   ` WANG Cong
2011-01-27  7:22     ` WANG Cong
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29 ` [PATCH 1/6] mm/page_alloc: use appropriate " Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines
2011-01-27  0:32   ` Ryan Mallon
2011-01-27  0:32   ` Ryan Mallon
2011-01-27  0:32     ` Ryan Mallon
2011-01-27  4:22     ` Mandeep Singh Baines
2011-01-27  4:22     ` Mandeep Singh Baines
2011-01-27  4:22       ` Mandeep Singh Baines
2011-01-27 20:32       ` Ryan Mallon
2011-01-27 20:32       ` Ryan Mallon
2011-01-27 20:32         ` Ryan Mallon
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29 ` [PATCH 2/6] arch/x86: " Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29 ` [PATCH 3/6] PM: " Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines
2011-01-31 10:12   ` Rafael J. Wysocki
2011-01-31 10:12   ` Rafael J. Wysocki
2011-01-31 10:12     ` Rafael J. Wysocki
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29 ` [PATCH 4/6] TTY: " Mandeep Singh Baines
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines
2011-02-03 22:13   ` Greg KH
2011-02-03 22:13     ` Greg KH
2011-02-06 17:31     ` [PATCH v2] " Mandeep Singh Baines
2011-02-06 17:31     ` Mandeep Singh Baines [this message]
2011-02-06 17:31       ` Mandeep Singh Baines
2011-02-03 22:13   ` [PATCH 4/6] " Greg KH
2011-01-26 23:29 ` [PATCH 5/6] fs: " Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29 ` [PATCH 6/6] taskstats: " Mandeep Singh Baines
2011-01-26 23:29 ` Mandeep Singh Baines
2011-01-26 23:29   ` Mandeep Singh Baines

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20110206173153.GT19745@google.com \
    --to=msb@chromium.org \
    --cc=akpm@linux-foundation.org \
    --cc=greg@kroah.com \
    --cc=gregkh@suse.de \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mm@kvack.org \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=mingo@redhat.com \
    --cc=rjw@sisk.pl \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.