lkml.org 
[lkml]   [2021]   [Jun]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip: x86/cleanups] x86/crash: Remove crash_reserve_low_1M()
    The following commit has been merged into the x86/cleanups branch of tip:

    Commit-ID: 23721c8e92f73f9f89e7362c50c2996a5c9ad483
    Gitweb: https://git.kernel.org/tip/23721c8e92f73f9f89e7362c50c2996a5c9ad483
    Author: Mike Rapoport <rppt@linux.ibm.com>
    AuthorDate: Tue, 01 Jun 2021 10:53:54 +03:00
    Committer: Borislav Petkov <bp@suse.de>
    CommitterDate: Mon, 07 Jun 2021 12:14:45 +02:00

    x86/crash: Remove crash_reserve_low_1M()

    The entire memory range under 1M is unconditionally reserved in
    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>
    Signed-off-by: Borislav Petkov <bp@suse.de>
    Link: https://lkml.kernel.org/r/20210601075354.5149-4-rppt@kernel.org
    ---
    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 f58de66..8b6bd63 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 54ce999..e8326a8 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)
    \
     
     \ /
      Last update: 2021-06-07 14:23    [W:2.548 / U:0.176 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site