UPSTREAM: console: Drop added "static" for newport_con
authorKees Cook <keescook@chromium.org>
Tue, 27 Feb 2018 21:11:21 +0000 (13:11 -0800)
committerDmitry Shmidt <dimitrysh@google.com>
Thu, 26 Apr 2018 19:32:34 +0000 (12:32 -0700)
Commit 4fe505119778 ("console: Expand dummy functions for CFI") accidentally
added "static" to newport_con instance of struct consw, while trying to
normalize the declarations. This, however, needed to stay non-static as it
has an extern.

Reported-by: kbuild test robot <fengguang.wu@intel.com>
Fixes: 4fe505119778 ("console: Expand dummy functions for CFI")
Signed-off-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit f54450ad1942287cc76b38021c0441fc4901d2de)

Change-Id: If64e3c52eb81603da6807a3bbf5c809441504530

drivers/video/console/newport_con.c

index 6897bd0fc00e7c6ae39e1ddcfd51b0283b940aea..7f2526b43b3364665df9350bb80d4f1eb168a6c4 100644 (file)
@@ -680,7 +680,7 @@ static int newport_set_origin(struct vc_data *vc)
 
 static void newport_save_screen(struct vc_data *vc) { }
 
-static const struct consw newport_con = {
+const struct consw newport_con = {
        .owner            = THIS_MODULE,
        .con_startup      = newport_startup,
        .con_init         = newport_init,