Skip to content

Commit

Permalink
vt: Fix build breakage when !CONFIG_VT_CONSOLE
Browse files Browse the repository at this point in the history
Commit 6895207 ("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>
  • Loading branch information
Peter Hurley authored and Greg Kroah-Hartman committed Nov 22, 2014
1 parent e4c787d commit 52c40fc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions drivers/tty/vt/vt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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
*
Expand Down

0 comments on commit 52c40fc

Please sign in to comment.