diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2023-10-17 11:39:47 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-10-17 16:34:02 +0200 |
| commit | 0059bc9a29e02853dbbaa0f6d0635a687c8b9835 (patch) | |
| tree | 245f6ea5f41cb398480492708fdb3ce441381874 /drivers/video/console | |
| parent | b8466fe82b79215b9ae28623a87c9a937ebd4f80 (diff) | |
| download | linux-0059bc9a29e02853dbbaa0f6d0635a687c8b9835.tar.gz linux-0059bc9a29e02853dbbaa0f6d0635a687c8b9835.tar.bz2 linux-0059bc9a29e02853dbbaa0f6d0635a687c8b9835.zip | |
console: fix up ARM screen_info reference
Separating the VGA console screen_info from the EFI one unfortunately
caused a build failure for footbridge that I had never caught
with randconfig builds:
arch/arm/kernel/setup.c:932:27: error: static declaration of 'vgacon_screen_info' follows non-static declaration
932 | static struct screen_info vgacon_screen_info = {
| ^~~~~~~~~~~~~~~~~~
In file included from arch/arm/kernel/setup.c:44:
arch/arm/include/asm/setup.h:40:27: note: previous declaration of 'vgacon_screen_info' with type 'struct screen_info'
40 | extern struct screen_info vgacon_screen_info;
| ^~~~~~~~~~~~~~~~~~
arm-linux-gnueabi-ld: drivers/video/console/dummycon.o: in function `dummycon_init':
dummycon.c:(.text+0xe4): undefined reference to `screen_info'
Make sure the variable is global to avoid the conflict with the extern
declaration, and make it work in dummycon.c
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Link: https://lore.kernel.org/r/20231017093947.3627976-2-arnd@kernel.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/video/console')
| -rw-r--r-- | drivers/video/console/dummycon.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 70549fecee12..14af5d9e13b0 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c @@ -19,8 +19,9 @@ */ #if defined(CONFIG_ARCH_FOOTBRIDGE) && defined(CONFIG_VGA_CONSOLE) -#define DUMMY_COLUMNS screen_info.orig_video_cols -#define DUMMY_ROWS screen_info.orig_video_lines +#include <asm/vga.h> +#define DUMMY_COLUMNS vgacon_screen_info.orig_video_cols +#define DUMMY_ROWS vgacon_screen_info.orig_video_lines #else /* set by Kconfig. Use 80x25 for 640x480 and 160x64 for 1280x1024 */ #define DUMMY_COLUMNS CONFIG_DUMMY_CONSOLE_COLUMNS |