From 85ccd0ce462d87109a6041fb8f42fc0d33b49a72 Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Tue, 27 Feb 2018 13:11:21 -0800 Subject: [PATCH] UPSTREAM: console: Drop added "static" for newport_con 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 Fixes: 4fe505119778 ("console: Expand dummy functions for CFI") Signed-off-by: Kees Cook Signed-off-by: Greg Kroah-Hartman (cherry picked from commit f54450ad1942287cc76b38021c0441fc4901d2de) Change-Id: If64e3c52eb81603da6807a3bbf5c809441504530 --- drivers/video/console/newport_con.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/video/console/newport_con.c b/drivers/video/console/newport_con.c index 6897bd0fc00e..7f2526b43b33 100644 --- a/drivers/video/console/newport_con.c +++ b/drivers/video/console/newport_con.c @@ -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, -- 2.20.1