From a4a13efe6b9f75a97051b98dc4aa17fb5dcbd643 Mon Sep 17 00:00:00 2001 From: Marcin Slusarz Date: Sun, 9 Aug 2009 21:54:03 +0200 Subject: [PATCH] --- yaml --- r: 163860 b: refs/heads/master c: 9074d963f4a5ab9c45e9edea32c3df4960bc7490 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/char/tty_ioctl.c | 4 +--- trunk/drivers/char/vt.c | 6 +----- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index ac7d21889d77..1c7b14a606d6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e92166517e3ca9bfb416f91e69cf0373b55b6ede +refs/heads/master: 9074d963f4a5ab9c45e9edea32c3df4960bc7490 diff --git a/trunk/drivers/char/tty_ioctl.c b/trunk/drivers/char/tty_ioctl.c index ad6ba4ed2808..8e67d5c642a4 100644 --- a/trunk/drivers/char/tty_ioctl.c +++ b/trunk/drivers/char/tty_ioctl.c @@ -393,9 +393,7 @@ void tty_termios_encode_baud_rate(struct ktermios *termios, termios->c_cflag |= (BOTHER << IBSHIFT); #else if (ifound == -1 || ofound == -1) { - static int warned; - if (!warned++) - printk(KERN_WARNING "tty: Unable to return correct " + printk_once(KERN_WARNING "tty: Unable to return correct " "speed data as your architecture needs updating.\n"); } #endif diff --git a/trunk/drivers/char/vt.c b/trunk/drivers/char/vt.c index 5dfbfa7d7606..0c80c68cd047 100644 --- a/trunk/drivers/char/vt.c +++ b/trunk/drivers/char/vt.c @@ -2129,11 +2129,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? */ - static int error = 0; - if (!error) { - error = 1; - printk("con_write: tty %d not allocated\n", currcons+1); - } + printk_once("con_write: tty %d not allocated\n", currcons+1); release_console_sem(); return 0; }