Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1ffdda95 authored by Mandeep Singh Baines's avatar Mandeep Singh Baines Committed by Greg Kroah-Hartman
Browse files

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: default avatarMandeep Singh Baines <msb@chromium.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 5427bcf5

drivers/tty/vt/vt.c

+8 −7
Original line number Diff line number Diff line
@@ -2158,7 +2158,7 @@ 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);

		pr_warn_once("con_write: tty %d not allocated\n", currcons+1);

		console_unlock();

		return 0;

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