2 files changed, 2 insertions, 8 deletions

diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index ad6ba4ed2808..8e67d5c642a4 100644
--- a/drivers/char/tty_ioctl.c
+++ b/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/drivers/char/vt.c b/drivers/char/vt.c
index 5dfbfa7d7606..0c80c68cd047 100644
--- a/drivers/char/vt.c
+++ b/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;
         }