aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/tty/vt
diff options
context:
space:
mode:
authorMandeep Singh Baines <msb@chromium.org>2011-02-06 12:31:53 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2011-02-17 14:12:40 -0500
commit1ffdda950394b6da54d68e9643bc691ebad7a6cc (patch)
treeb9206925825c1074110db5c245e4ef065810ac2f /drivers/tty/vt
parent5427bcf5e95245d3e220742ac703182bdb973769 (diff)
TTY: use appropriate printk priority level
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> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers/tty/vt')
-rw-r--r--drivers/tty/vt/vt.c15
1 files changed, 8 insertions, 7 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 147ede3423df..d5669ff72df4 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
2157 2157
2158 currcons = vc->vc_num; 2158 currcons = vc->vc_num;
2159 if (!vc_cons_allocated(currcons)) { 2159 if (!vc_cons_allocated(currcons)) {
2160 /* could this happen? */ 2160 /* could this happen? */
2161 printk_once("con_write: tty %d not allocated\n", currcons+1); 2161 pr_warn_once("con_write: tty %d not allocated\n", currcons+1);
2162 console_unlock(); 2162 console_unlock();
2163 return 0; 2163 return 0;
2164 } 2164 }
2165 2165
2166 himask = vc->vc_hi_font_mask; 2166 himask = vc->vc_hi_font_mask;
@@ -2940,7 +2940,7 @@ static int __init con_init(void)
2940 gotoxy(vc, vc->vc_x, vc->vc_y); 2940 gotoxy(vc, vc->vc_x, vc->vc_y);
2941 csi_J(vc, 0); 2941 csi_J(vc, 0);
2942 update_screen(vc); 2942 update_screen(vc);
2943 printk("Console: %s %s %dx%d", 2943 pr_info("Console: %s %s %dx%d",
2944 vc->vc_can_do_color ? "colour" : "mono", 2944 vc->vc_can_do_color ? "colour" : "mono",
2945 display_desc, vc->vc_cols, vc->vc_rows); 2945 display_desc, vc->vc_cols, vc->vc_rows);
2946 printable = 1; 2946 printable = 1;
@@ -3103,7 +3103,7 @@ static int bind_con_driver(const struct consw *csw, int first, int last,
3103 clear_buffer_attributes(vc); 3103 clear_buffer_attributes(vc);
3104 } 3104 }
3105 3105
3106 printk("Console: switching "); 3106 pr_info("Console: switching ");
3107 if (!deflt) 3107 if (!deflt)
3108 printk("consoles %d-%d ", first+1, last+1); 3108 printk("consoles %d-%d ", first+1, last+1);
3109 if (j >= 0) { 3109 if (j >= 0) {
@@ -3809,7 +3809,8 @@ void do_unblank_screen(int leaving_gfx)
3809 return; 3809 return;
3810 if (!vc_cons_allocated(fg_console)) { 3810 if (!vc_cons_allocated(fg_console)) {
3811 /* impossible */ 3811 /* impossible */
3812 printk("unblank_screen: tty %d not allocated ??\n", fg_console+1); 3812 pr_warning("unblank_screen: tty %d not allocated ??\n",
3813 fg_console+1);
3813 return; 3814 return;
3814 } 3815 }
3815 vc = vc_cons[fg_console].d; 3816 vc = vc_cons[fg_console].d;