From: "tip-bot2 for Mike Rapoport" <tip-bot2@linutronix.de>
To: linux-tip-commits@vger.kernel.org
Cc: Mike Rapoport <rppt@linux.ibm.com>, Borislav Petkov <bp@suse.de>,
x86@kernel.org, linux-kernel@vger.kernel.org
Subject: [tip: x86/cleanups] x86/crash: Remove crash_reserve_low_1M()
Date: Mon, 07 Jun 2021 12:22:18 -0000 [thread overview]
Message-ID: <162306853884.29796.12879946484223593923.tip-bot2@tip-bot2> (raw)
In-Reply-To: <20210601075354.5149-4-rppt@kernel.org>
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)
next prev parent reply other threads:[~2021-06-07 12:22 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-01 7:53 [PATCH 0/3] x86/setup: always resrve the first 1M of RAM Mike Rapoport
2021-06-01 7:53 ` [PATCH 1/3] x86/setup: always reserve " Mike Rapoport
2021-06-01 9:06 ` Baoquan He
2021-06-01 17:19 ` Mike Rapoport
2021-06-03 17:57 ` Borislav Petkov
2021-06-03 18:01 ` [tip: x86/urgent] x86/setup: Always " tip-bot2 for Mike Rapoport
2023-03-02 3:51 ` Andy Lutomirski
2023-03-02 10:50 ` Borislav Petkov
2023-03-02 15:06 ` Andy Lutomirski
2023-03-02 15:22 ` Borislav Petkov
2023-03-02 16:59 ` Andy Lutomirski
2023-03-03 9:10 ` Mike Rapoport
2023-03-07 0:33 ` Andy Lutomirski
2021-07-01 17:15 ` [PATCH 1/3] x86/setup: always " Dave Hansen
2021-07-01 19:45 ` Mike Rapoport
2021-06-01 7:53 ` [PATCH 2/3] x86/setup: remove CONFIG_X86_RESERVE_LOW and reservelow options Mike Rapoport
2021-06-07 12:22 ` [tip: x86/cleanups] x86/setup: Remove CONFIG_X86_RESERVE_LOW and reservelow= options tip-bot2 for Mike Rapoport
2021-06-01 7:53 ` [PATCH 3/3] x86/crash: remove crash_reserve_low_1M() Mike Rapoport
2021-06-07 12:22 ` tip-bot2 for Mike Rapoport [this message]
2021-06-01 18:10 ` [PATCH 0/3] x86/setup: always resrve the first 1M of RAM Hugh Dickins
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=162306853884.29796.12879946484223593923.tip-bot2@tip-bot2 \
--to=tip-bot2@linutronix.de \
--cc=bp@suse.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=rppt@linux.ibm.com \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).