Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 235520
b: refs/heads/master
c: 1ffdda9
h: refs/heads/master
v: v3
  • Loading branch information
Mandeep Singh Baines authored and Greg Kroah-Hartman committed Feb 17, 2011
1 parent eacc397 commit 1cf7a42
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 5427bcf5e95245d3e220742ac703182bdb973769
refs/heads/master: 1ffdda950394b6da54d68e9643bc691ebad7a6cc
15 changes: 8 additions & 7 deletions trunk/drivers/tty/vt/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 1cf7a42

Please sign in to comment.