summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hurley <peter@hurleysoftware.com>2014-11-11 16:20:56 (GMT)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-11-22 15:48:51 (GMT)
commit52c40fca1a80abaffd9f7315de568d89a2064734 (patch)
tree82fe3a0db02abd0f4eb4ab311362dfacfd7df748
parente4c787dac21e50ac9ef53fac91b9182d4fede465 (diff)
downloadlinux-52c40fca1a80abaffd9f7315de568d89a2064734.tar.xz
vt: Fix build breakage when !CONFIG_VT_CONSOLE
Commit 68952076e9226cc23ebce66d3fc2fdb8b6c04c30 ("vt: Remove vt_get_kmsg_redirect() from uapi header") fails to compile if !CONFIG_VT_CONSOLE. Move macro definition for vt_get_kmsg_redirect() up with file-scope function declarations. Reported-by: Jim Davis <jim.epost@gmail.com> Signed-off-by: Peter Hurley <peter@hurleysoftware.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/tty/vt/vt.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/tty/vt/vt.c b/drivers/tty/vt/vt.c
index 43c2c24..ed01365 100644
--- 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
*