Merge tag 'riscv-for-linus-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / riscv / kernel / setup.c

diff --git a/arch/riscv/kernel/setup.c b/arch/riscv/kernel/setup.c
index 8fd6c02353d43403fc8662bd740fb9ac609317d5..535a837de55d1ba3aa8a45fe4123404ce1a9430f 100644 (file)
--- a/arch/riscv/kernel/setup.c
+++ b/arch/riscv/kernel/setup.c
@@ -15,7 +15,6 @@
 #include <linux/memblock.h>
 #include <linux/sched.h>
 #include <linux/console.h>
-#include <linux/screen_info.h>
 #include <linux/of_fdt.h>
 #include <linux/sched/task.h>
 #include <linux/smp.h>
@@ -41,17 +40,6 @@
 
 #include "head.h"
 
-#if defined(CONFIG_DUMMY_CONSOLE) || defined(CONFIG_EFI)
-struct screen_info screen_info __section(".data") = {
-       .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
-
 /*
  * The lucky hart to first increment this variable will boot the other cores.
  * This is used before the kernel initializes the BSS so it can't be in the
@@ -174,19 +162,6 @@ static void __init init_resources(void)
        if (ret < 0)
                goto error;
 
-#ifdef CONFIG_KEXEC_CORE
-       if (crashk_res.start != crashk_res.end) {
-               ret = add_resource(&iomem_resource, &crashk_res);
-               if (ret < 0)
-                       goto error;
-       }
-       if (crashk_low_res.start != crashk_low_res.end) {
-               ret = add_resource(&iomem_resource, &crashk_low_res);
-               if (ret < 0)
-                       goto error;
-       }
-#endif
-
 #ifdef CONFIG_CRASH_DUMP
        if (elfcorehdr_size > 0) {
                elfcorehdr_res.start = elfcorehdr_addr;