Merge tag 'iwlwifi-next-for-kalle-2015-02-03' of https://git.kernel.org/pub/scm/linux...

[firefly-linux-kernel-4.4.55.git] / drivers / tty / vt / vt.c

diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 43c2c2495907398ac7a72b1cf41bb97be390d4d1..f3fbbbca9bde1ba4d9a9a5ccda71f96b2d464eac 100644 (file)
--- a/drivers/tty/vt/vt.c
+++ b/drivers/tty/vt/vt.c
@@ -156,6 +156,8 @@ static void console_callback(struct work_struct *ignored);
 static void blank_screen_t(unsigned long dummy);
 static void set_palette(struct vc_data *vc);
 
+#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
+
 static int printable;          /* Is console ready for printing? */
 int default_utf8 = true;
 module_param(default_utf8, int, S_IRUGO | S_IWUSR);
@@ -2513,8 +2515,6 @@ int vt_kmsg_redirect(int new)
                return kmsg_con;
 }
 
-#define vt_get_kmsg_redirect() vt_kmsg_redirect(-1)
-
 /*
  *     Console on virtual terminal
  *
@@ -3855,8 +3855,8 @@ void do_unblank_screen(int leaving_gfx)
                return;
        if (!vc_cons_allocated(fg_console)) {
                /* impossible */
-               pr_warning("unblank_screen: tty %d not allocated ??\n",
-                          fg_console+1);
+               pr_warn("unblank_screen: tty %d not allocated ??\n",
+                       fg_console + 1);
                return;
        }
        vc = vc_cons[fg_console].d;