| Message ID | 20230707095415.1449376-4-arnd@kernel.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [1/4] vgacon: rework Kconfig dependencies | expand |
On Fri, 07 Jul 2023 02:52:26 PDT (-0700), arnd@kernel.org wrote: > From: Arnd Bergmann <arnd@arndb.de> > > A number of architectures either kept the screen_info definition for > historical purposes as it used to be required by the generic VT code, or > they copied it from another architecture in order to build the VGA > console driver in an allmodconfig build. > > Now that vgacon no longer builds on these architectures, remove the > stale definitions. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/csky/kernel/setup.c | 12 ------------ > arch/hexagon/kernel/Makefile | 2 -- > arch/hexagon/kernel/screen_info.c | 3 --- > arch/nios2/kernel/setup.c | 5 ----- > arch/sh/kernel/setup.c | 5 ----- > arch/sparc/kernel/setup_32.c | 13 ------------- > arch/sparc/kernel/setup_64.c | 13 ------------- > arch/xtensa/kernel/setup.c | 12 ------------ > 8 files changed, 65 deletions(-) > delete mode 100644 arch/hexagon/kernel/screen_info.c > > diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c > index 106fbf0b6f3b4..51012e90780d6 100644 > --- a/arch/csky/kernel/setup.c > +++ b/arch/csky/kernel/setup.c > @@ -8,22 +8,10 @@ > #include <linux/of_fdt.h> > #include <linux/start_kernel.h> > #include <linux/dma-map-ops.h> > -#include <linux/screen_info.h> > #include <asm/sections.h> > #include <asm/mmu_context.h> > #include <asm/pgalloc.h> > > -#ifdef CONFIG_DUMMY_CONSOLE > -struct screen_info screen_info = { > - .orig_video_lines = 30, > - .orig_video_cols = 80, > - .orig_video_mode = 0, > - .orig_video_ega_bx = 0, > - .orig_video_isVGA = 1, > - .orig_video_points = 8 > -}; > -#endif > - > static void __init csky_memblock_init(void) > { > unsigned long lowmem_size = PFN_DOWN(LOWMEM_LIMIT - PHYS_OFFSET_OFFSET); > diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile > index e73cb321630ec..3fdf937eb572e 100644 > --- a/arch/hexagon/kernel/Makefile > +++ b/arch/hexagon/kernel/Makefile > @@ -17,5 +17,3 @@ obj-y += vm_vectors.o > obj-$(CONFIG_HAS_DMA) += dma.o > > obj-$(CONFIG_STACKTRACE) += stacktrace.o > - > -obj-$(CONFIG_VGA_CONSOLE) += screen_info.o > diff --git a/arch/hexagon/kernel/screen_info.c b/arch/hexagon/kernel/screen_info.c > deleted file mode 100644 > index 1e1ceb18bafe7..0000000000000 > --- a/arch/hexagon/kernel/screen_info.c > +++ /dev/null > @@ -1,3 +0,0 @@ > -#include <linux/screen_info.h> > - > -struct screen_info screen_info; > diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c > index 8582ed9658447..da122a5fa43b2 100644 > --- a/arch/nios2/kernel/setup.c > +++ b/arch/nios2/kernel/setup.c > @@ -19,7 +19,6 @@ > #include <linux/memblock.h> > #include <linux/initrd.h> > #include <linux/of_fdt.h> > -#include <linux/screen_info.h> > > #include <asm/mmu_context.h> > #include <asm/sections.h> > @@ -36,10 +35,6 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, > 0}; > > -#ifdef CONFIG_VT > -struct screen_info screen_info; > -#endif > - > /* Copy a short hook instruction sequence to the exception address */ > static inline void copy_exception_handler(unsigned int addr) > { > diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c > index b3da2757faaf3..3d80515298d26 100644 > --- a/arch/sh/kernel/setup.c > +++ b/arch/sh/kernel/setup.c > @@ -7,7 +7,6 @@ > * Copyright (C) 1999 Niibe Yutaka > * Copyright (C) 2002 - 2010 Paul Mundt > */ > -#include <linux/screen_info.h> > #include <linux/ioport.h> > #include <linux/init.h> > #include <linux/initrd.h> > @@ -69,10 +68,6 @@ EXPORT_SYMBOL(cpu_data); > struct sh_machine_vector sh_mv = { .mv_name = "generic", }; > EXPORT_SYMBOL(sh_mv); > > -#ifdef CONFIG_VT > -struct screen_info screen_info; > -#endif > - > extern int root_mountflags; > > #define RAMDISK_IMAGE_START_MASK 0x07FF > diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c > index 34ef7febf0d56..e3b72a7b46d37 100644 > --- a/arch/sparc/kernel/setup_32.c > +++ b/arch/sparc/kernel/setup_32.c > @@ -17,7 +17,6 @@ > #include <linux/initrd.h> > #include <asm/smp.h> > #include <linux/user.h> > -#include <linux/screen_info.h> > #include <linux/delay.h> > #include <linux/fs.h> > #include <linux/seq_file.h> > @@ -51,18 +50,6 @@ > > #include "kernel.h" > > -struct screen_info screen_info = { > - 0, 0, /* orig-x, orig-y */ > - 0, /* unused */ > - 0, /* orig-video-page */ > - 0, /* orig-video-mode */ > - 128, /* orig-video-cols */ > - 0,0,0, /* ega_ax, ega_bx, ega_cx */ > - 54, /* orig-video-lines */ > - 0, /* orig-video-isVGA */ > - 16 /* orig-video-points */ > -}; > - > /* Typing sync at the prom prompt calls the function pointed to by > * romvec->pv_synchook which I set to the following function. > * This should sync all filesystems and return, for now it just > diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c > index 6546ca9d4d3f1..6a4797dec34b4 100644 > --- a/arch/sparc/kernel/setup_64.c > +++ b/arch/sparc/kernel/setup_64.c > @@ -15,7 +15,6 @@ > #include <linux/ptrace.h> > #include <asm/smp.h> > #include <linux/user.h> > -#include <linux/screen_info.h> > #include <linux/delay.h> > #include <linux/fs.h> > #include <linux/seq_file.h> > @@ -68,18 +67,6 @@ > DEFINE_SPINLOCK(ns87303_lock); > EXPORT_SYMBOL(ns87303_lock); > > -struct screen_info screen_info = { > - 0, 0, /* orig-x, orig-y */ > - 0, /* unused */ > - 0, /* orig-video-page */ > - 0, /* orig-video-mode */ > - 128, /* orig-video-cols */ > - 0, 0, 0, /* unused, ega_bx, unused */ > - 54, /* orig-video-lines */ > - 0, /* orig-video-isVGA */ > - 16 /* orig-video-points */ > -}; > - > static void > prom_console_write(struct console *con, const char *s, unsigned int n) > { > diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c > index aba3ff4e60d85..3f22d0537818d 100644 > --- a/arch/xtensa/kernel/setup.c > +++ b/arch/xtensa/kernel/setup.c > @@ -19,7 +19,6 @@ > #include <linux/init.h> > #include <linux/mm.h> > #include <linux/proc_fs.h> > -#include <linux/screen_info.h> > #include <linux/kernel.h> > #include <linux/percpu.h> > #include <linux/reboot.h> > @@ -49,17 +48,6 @@ > #include <asm/timex.h> > #include <asm/traps.h> > > -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) > -struct screen_info screen_info = { > - .orig_x = 0, > - .orig_y = 24, > - .orig_video_cols = 80, > - .orig_video_lines = 24, > - .orig_video_isVGA = 1, > - .orig_video_points = 16, > -}; > -#endif > - > #ifdef CONFIG_BLK_DEV_INITRD > extern unsigned long initrd_start; > extern unsigned long initrd_end; Acked-by: Palmer Dabbelt <palmer@rivosinc.com>
csky: Acked-by: Guo Ren <guoren@kernel.org> On Fri, Jul 7, 2023 at 5:56 AM Arnd Bergmann <arnd@kernel.org> wrote: > > From: Arnd Bergmann <arnd@arndb.de> > > A number of architectures either kept the screen_info definition for > historical purposes as it used to be required by the generic VT code, or > they copied it from another architecture in order to build the VGA > console driver in an allmodconfig build. > > Now that vgacon no longer builds on these architectures, remove the > stale definitions. > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/csky/kernel/setup.c | 12 ------------ > arch/hexagon/kernel/Makefile | 2 -- > arch/hexagon/kernel/screen_info.c | 3 --- > arch/nios2/kernel/setup.c | 5 ----- > arch/sh/kernel/setup.c | 5 ----- > arch/sparc/kernel/setup_32.c | 13 ------------- > arch/sparc/kernel/setup_64.c | 13 ------------- > arch/xtensa/kernel/setup.c | 12 ------------ > 8 files changed, 65 deletions(-) > delete mode 100644 arch/hexagon/kernel/screen_info.c > > diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c > index 106fbf0b6f3b4..51012e90780d6 100644 > --- a/arch/csky/kernel/setup.c > +++ b/arch/csky/kernel/setup.c > @@ -8,22 +8,10 @@ > #include <linux/of_fdt.h> > #include <linux/start_kernel.h> > #include <linux/dma-map-ops.h> > -#include <linux/screen_info.h> > #include <asm/sections.h> > #include <asm/mmu_context.h> > #include <asm/pgalloc.h> > > -#ifdef CONFIG_DUMMY_CONSOLE > -struct screen_info screen_info = { > - .orig_video_lines = 30, > - .orig_video_cols = 80, > - .orig_video_mode = 0, > - .orig_video_ega_bx = 0, > - .orig_video_isVGA = 1, > - .orig_video_points = 8 > -}; > -#endif > - > static void __init csky_memblock_init(void) > { > unsigned long lowmem_size = PFN_DOWN(LOWMEM_LIMIT - PHYS_OFFSET_OFFSET); > diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile > index e73cb321630ec..3fdf937eb572e 100644 > --- a/arch/hexagon/kernel/Makefile > +++ b/arch/hexagon/kernel/Makefile > @@ -17,5 +17,3 @@ obj-y += vm_vectors.o > obj-$(CONFIG_HAS_DMA) += dma.o > > obj-$(CONFIG_STACKTRACE) += stacktrace.o > - > -obj-$(CONFIG_VGA_CONSOLE) += screen_info.o > diff --git a/arch/hexagon/kernel/screen_info.c b/arch/hexagon/kernel/screen_info.c > deleted file mode 100644 > index 1e1ceb18bafe7..0000000000000 > --- a/arch/hexagon/kernel/screen_info.c > +++ /dev/null > @@ -1,3 +0,0 @@ > -#include <linux/screen_info.h> > - > -struct screen_info screen_info; > diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c > index 8582ed9658447..da122a5fa43b2 100644 > --- a/arch/nios2/kernel/setup.c > +++ b/arch/nios2/kernel/setup.c > @@ -19,7 +19,6 @@ > #include <linux/memblock.h> > #include <linux/initrd.h> > #include <linux/of_fdt.h> > -#include <linux/screen_info.h> > > #include <asm/mmu_context.h> > #include <asm/sections.h> > @@ -36,10 +35,6 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, > 0, 0, 0, 0, 0, 0, > 0}; > > -#ifdef CONFIG_VT > -struct screen_info screen_info; > -#endif > - > /* Copy a short hook instruction sequence to the exception address */ > static inline void copy_exception_handler(unsigned int addr) > { > diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c > index b3da2757faaf3..3d80515298d26 100644 > --- a/arch/sh/kernel/setup.c > +++ b/arch/sh/kernel/setup.c > @@ -7,7 +7,6 @@ > * Copyright (C) 1999 Niibe Yutaka > * Copyright (C) 2002 - 2010 Paul Mundt > */ > -#include <linux/screen_info.h> > #include <linux/ioport.h> > #include <linux/init.h> > #include <linux/initrd.h> > @@ -69,10 +68,6 @@ EXPORT_SYMBOL(cpu_data); > struct sh_machine_vector sh_mv = { .mv_name = "generic", }; > EXPORT_SYMBOL(sh_mv); > > -#ifdef CONFIG_VT > -struct screen_info screen_info; > -#endif > - > extern int root_mountflags; > > #define RAMDISK_IMAGE_START_MASK 0x07FF > diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c > index 34ef7febf0d56..e3b72a7b46d37 100644 > --- a/arch/sparc/kernel/setup_32.c > +++ b/arch/sparc/kernel/setup_32.c > @@ -17,7 +17,6 @@ > #include <linux/initrd.h> > #include <asm/smp.h> > #include <linux/user.h> > -#include <linux/screen_info.h> > #include <linux/delay.h> > #include <linux/fs.h> > #include <linux/seq_file.h> > @@ -51,18 +50,6 @@ > > #include "kernel.h" > > -struct screen_info screen_info = { > - 0, 0, /* orig-x, orig-y */ > - 0, /* unused */ > - 0, /* orig-video-page */ > - 0, /* orig-video-mode */ > - 128, /* orig-video-cols */ > - 0,0,0, /* ega_ax, ega_bx, ega_cx */ > - 54, /* orig-video-lines */ > - 0, /* orig-video-isVGA */ > - 16 /* orig-video-points */ > -}; > - > /* Typing sync at the prom prompt calls the function pointed to by > * romvec->pv_synchook which I set to the following function. > * This should sync all filesystems and return, for now it just > diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c > index 6546ca9d4d3f1..6a4797dec34b4 100644 > --- a/arch/sparc/kernel/setup_64.c > +++ b/arch/sparc/kernel/setup_64.c > @@ -15,7 +15,6 @@ > #include <linux/ptrace.h> > #include <asm/smp.h> > #include <linux/user.h> > -#include <linux/screen_info.h> > #include <linux/delay.h> > #include <linux/fs.h> > #include <linux/seq_file.h> > @@ -68,18 +67,6 @@ > DEFINE_SPINLOCK(ns87303_lock); > EXPORT_SYMBOL(ns87303_lock); > > -struct screen_info screen_info = { > - 0, 0, /* orig-x, orig-y */ > - 0, /* unused */ > - 0, /* orig-video-page */ > - 0, /* orig-video-mode */ > - 128, /* orig-video-cols */ > - 0, 0, 0, /* unused, ega_bx, unused */ > - 54, /* orig-video-lines */ > - 0, /* orig-video-isVGA */ > - 16 /* orig-video-points */ > -}; > - > static void > prom_console_write(struct console *con, const char *s, unsigned int n) > { > diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c > index aba3ff4e60d85..3f22d0537818d 100644 > --- a/arch/xtensa/kernel/setup.c > +++ b/arch/xtensa/kernel/setup.c > @@ -19,7 +19,6 @@ > #include <linux/init.h> > #include <linux/mm.h> > #include <linux/proc_fs.h> > -#include <linux/screen_info.h> > #include <linux/kernel.h> > #include <linux/percpu.h> > #include <linux/reboot.h> > @@ -49,17 +48,6 @@ > #include <asm/timex.h> > #include <asm/traps.h> > > -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) > -struct screen_info screen_info = { > - .orig_x = 0, > - .orig_y = 24, > - .orig_video_cols = 80, > - .orig_video_lines = 24, > - .orig_video_isVGA = 1, > - .orig_video_points = 16, > -}; > -#endif > - > #ifdef CONFIG_BLK_DEV_INITRD > extern unsigned long initrd_start; > extern unsigned long initrd_end; > -- > 2.39.2 >
diff --git a/arch/csky/kernel/setup.c b/arch/csky/kernel/setup.c index 106fbf0b6f3b4..51012e90780d6 100644 --- a/arch/csky/kernel/setup.c +++ b/arch/csky/kernel/setup.c @@ -8,22 +8,10 @@ #include <linux/of_fdt.h> #include <linux/start_kernel.h> #include <linux/dma-map-ops.h> -#include <linux/screen_info.h> #include <asm/sections.h> #include <asm/mmu_context.h> #include <asm/pgalloc.h> -#ifdef CONFIG_DUMMY_CONSOLE -struct screen_info screen_info = { - .orig_video_lines = 30, - .orig_video_cols = 80, - .orig_video_mode = 0, - .orig_video_ega_bx = 0, - .orig_video_isVGA = 1, - .orig_video_points = 8 -}; -#endif - static void __init csky_memblock_init(void) { unsigned long lowmem_size = PFN_DOWN(LOWMEM_LIMIT - PHYS_OFFSET_OFFSET); diff --git a/arch/hexagon/kernel/Makefile b/arch/hexagon/kernel/Makefile index e73cb321630ec..3fdf937eb572e 100644 --- a/arch/hexagon/kernel/Makefile +++ b/arch/hexagon/kernel/Makefile @@ -17,5 +17,3 @@ obj-y += vm_vectors.o obj-$(CONFIG_HAS_DMA) += dma.o obj-$(CONFIG_STACKTRACE) += stacktrace.o - -obj-$(CONFIG_VGA_CONSOLE) += screen_info.o diff --git a/arch/hexagon/kernel/screen_info.c b/arch/hexagon/kernel/screen_info.c deleted file mode 100644 index 1e1ceb18bafe7..0000000000000 --- a/arch/hexagon/kernel/screen_info.c +++ /dev/null @@ -1,3 +0,0 @@ -#include <linux/screen_info.h> - -struct screen_info screen_info; diff --git a/arch/nios2/kernel/setup.c b/arch/nios2/kernel/setup.c index 8582ed9658447..da122a5fa43b2 100644 --- a/arch/nios2/kernel/setup.c +++ b/arch/nios2/kernel/setup.c @@ -19,7 +19,6 @@ #include <linux/memblock.h> #include <linux/initrd.h> #include <linux/of_fdt.h> -#include <linux/screen_info.h> #include <asm/mmu_context.h> #include <asm/sections.h> @@ -36,10 +35,6 @@ static struct pt_regs fake_regs = { 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}; -#ifdef CONFIG_VT -struct screen_info screen_info; -#endif - /* Copy a short hook instruction sequence to the exception address */ static inline void copy_exception_handler(unsigned int addr) { diff --git a/arch/sh/kernel/setup.c b/arch/sh/kernel/setup.c index b3da2757faaf3..3d80515298d26 100644 --- a/arch/sh/kernel/setup.c +++ b/arch/sh/kernel/setup.c @@ -7,7 +7,6 @@ * Copyright (C) 1999 Niibe Yutaka * Copyright (C) 2002 - 2010 Paul Mundt */ -#include <linux/screen_info.h> #include <linux/ioport.h> #include <linux/init.h> #include <linux/initrd.h> @@ -69,10 +68,6 @@ EXPORT_SYMBOL(cpu_data); struct sh_machine_vector sh_mv = { .mv_name = "generic", }; EXPORT_SYMBOL(sh_mv); -#ifdef CONFIG_VT -struct screen_info screen_info; -#endif - extern int root_mountflags; #define RAMDISK_IMAGE_START_MASK 0x07FF diff --git a/arch/sparc/kernel/setup_32.c b/arch/sparc/kernel/setup_32.c index 34ef7febf0d56..e3b72a7b46d37 100644 --- a/arch/sparc/kernel/setup_32.c +++ b/arch/sparc/kernel/setup_32.c @@ -17,7 +17,6 @@ #include <linux/initrd.h> #include <asm/smp.h> #include <linux/user.h> -#include <linux/screen_info.h> #include <linux/delay.h> #include <linux/fs.h> #include <linux/seq_file.h> @@ -51,18 +50,6 @@ #include "kernel.h" -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0,0,0, /* ega_ax, ega_bx, ega_cx */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - /* Typing sync at the prom prompt calls the function pointed to by * romvec->pv_synchook which I set to the following function. * This should sync all filesystems and return, for now it just diff --git a/arch/sparc/kernel/setup_64.c b/arch/sparc/kernel/setup_64.c index 6546ca9d4d3f1..6a4797dec34b4 100644 --- a/arch/sparc/kernel/setup_64.c +++ b/arch/sparc/kernel/setup_64.c @@ -15,7 +15,6 @@ #include <linux/ptrace.h> #include <asm/smp.h> #include <linux/user.h> -#include <linux/screen_info.h> #include <linux/delay.h> #include <linux/fs.h> #include <linux/seq_file.h> @@ -68,18 +67,6 @@ DEFINE_SPINLOCK(ns87303_lock); EXPORT_SYMBOL(ns87303_lock); -struct screen_info screen_info = { - 0, 0, /* orig-x, orig-y */ - 0, /* unused */ - 0, /* orig-video-page */ - 0, /* orig-video-mode */ - 128, /* orig-video-cols */ - 0, 0, 0, /* unused, ega_bx, unused */ - 54, /* orig-video-lines */ - 0, /* orig-video-isVGA */ - 16 /* orig-video-points */ -}; - static void prom_console_write(struct console *con, const char *s, unsigned int n) { diff --git a/arch/xtensa/kernel/setup.c b/arch/xtensa/kernel/setup.c index aba3ff4e60d85..3f22d0537818d 100644 --- a/arch/xtensa/kernel/setup.c +++ b/arch/xtensa/kernel/setup.c @@ -19,7 +19,6 @@ #include <linux/init.h> #include <linux/mm.h> #include <linux/proc_fs.h> -#include <linux/screen_info.h> #include <linux/kernel.h> #include <linux/percpu.h> #include <linux/reboot.h> @@ -49,17 +48,6 @@ #include <asm/timex.h> #include <asm/traps.h> -#if defined(CONFIG_VGA_CONSOLE) || defined(CONFIG_DUMMY_CONSOLE) -struct screen_info screen_info = { - .orig_x = 0, - .orig_y = 24, - .orig_video_cols = 80, - .orig_video_lines = 24, - .orig_video_isVGA = 1, - .orig_video_points = 16, -}; -#endif - #ifdef CONFIG_BLK_DEV_INITRD extern unsigned long initrd_start; extern unsigned long initrd_end;