diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 13:10:25 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-06-28 13:10:25 -0700 |
| commit | 8e4d7a78f08a788a839bd88a2710ba7a71a86e24 (patch) | |
| tree | e577d7c6847c365bb12045d7a723ada238cfb2a2 /arch/x86/kernel/crash.c | |
| parent | 98e62da8b3ee9ac3faf388fd78ee982a765170a7 (diff) | |
| parent | 1d3156396cf6ea0873145092f4e040374ff1d862 (diff) | |
| download | linux-8e4d7a78f08a788a839bd88a2710ba7a71a86e24.tar.gz linux-8e4d7a78f08a788a839bd88a2710ba7a71a86e24.tar.bz2 linux-8e4d7a78f08a788a839bd88a2710ba7a71a86e24.zip | |
Merge tag 'x86-cleanups-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 cleanups from Ingo Molnar:
"Misc cleanups & removal of obsolete code"
* tag 'x86-cleanups-2021-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/sgx: Correct kernel-doc's arg name in sgx_encl_release()
doc: Remove references to IBM Calgary
x86/setup: Document that Windows reserves the first MiB
x86/crash: Remove crash_reserve_low_1M()
x86/setup: Remove CONFIG_X86_RESERVE_LOW and reservelow= options
x86/alternative: Align insn bytes vertically
x86: Fix leftover comment typos
x86/asm: Simplify __smp_mb() definition
x86/alternatives: Make the x86nops[] symbol static
Diffstat (limited to 'arch/x86/kernel/crash.c')
| -rw-r--r-- | arch/x86/kernel/crash.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/arch/x86/kernel/crash.c b/arch/x86/kernel/crash.c index 54ce999ed321..e8326a8d1c5d 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) |