summarylogtreecommitdiffstats
path: root/0007-x86-crash-remove-crash_reserve_low_1M.patch
diff options
context:
space:
mode:
Diffstat (limited to '0007-x86-crash-remove-crash_reserve_low_1M.patch')
-rw-r--r--0007-x86-crash-remove-crash_reserve_low_1M.patch58
1 files changed, 58 insertions, 0 deletions
diff --git a/0007-x86-crash-remove-crash_reserve_low_1M.patch b/0007-x86-crash-remove-crash_reserve_low_1M.patch
new file mode 100644
index 00000000000..903e5fa0969
--- /dev/null
+++ b/0007-x86-crash-remove-crash_reserve_low_1M.patch
@@ -0,0 +1,58 @@
+From bb4c1200fdfd6c17fff64e159e625c3678342b87 Mon Sep 17 00:00:00 2001
+From: Mike Rapoport <rppt@linux.ibm.com>
+Date: Tue, 1 Jun 2021 10:53:54 +0300
+Subject: [PATCH 7/8] x86/crash: remove crash_reserve_low_1M()
+
+The entire memory range under 1M is unconditionally reserved at
+setup_arch(), so there is no need for crash_reserve_low_1M() anymore.
+
+Remove this function.
+
+Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
+---
+ arch/x86/include/asm/crash.h | 6 ------
+ arch/x86/kernel/crash.c | 13 -------------
+ 2 files changed, 19 deletions(-)
+
+diff --git a/arch/x86/include/asm/crash.h b/arch/x86/include/asm/crash.h
+index f58de66091e5..8b6bd63530dc 100644
+--- a/arch/x86/include/asm/crash.h
++++ b/arch/x86/include/asm/crash.h
+@@ -9,10 +9,4 @@ int crash_setup_memmap_entries(struct kimage *image,
+ struct boot_params *params);
+ void crash_smp_send_stop(void);
+
+-#ifdef CONFIG_KEXEC_CORE
+-void __init crash_reserve_low_1M(void);
+-#else
+-static inline void __init crash_reserve_low_1M(void) { }
+-#endif
+-
+ #endif /* _ASM_X86_CRASH_H */
+diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c
+index b1deacbeb266..e0b8d9662da5 100644
+--- a/arch/x86/kernel/crash.c
++++ b/arch/x86/kernel/crash.c
+@@ -70,19 +70,6 @@ static inline void cpu_crash_vmclear_loaded_vmcss(void)
+ rcu_read_unlock();
+ }
+
+-/*
+- * When the crashkernel option is specified, only use the low
+- * 1M for the real mode trampoline.
+- */
+-void __init crash_reserve_low_1M(void)
+-{
+- if (cmdline_find_option(boot_command_line, "crashkernel", NULL, 0) < 0)
+- return;
+-
+- memblock_reserve(0, 1<<20);
+- pr_info("Reserving the low 1M of memory for crashkernel\n");
+-}
+-
+ #if defined(CONFIG_SMP) && defined(CONFIG_X86_LOCAL_APIC)
+
+ static void kdump_nmi_callback(int cpu, struct pt_regs *regs)
+--
+2.32.0
+