Commit 4ece09be authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Linus Torvalds

x86/setup: use IS_ENABLED(CONFIG_KEXEC_CORE) instead of #ifdef

Replace the conditional compilation using "#ifdef CONFIG_KEXEC_CORE" by a
check for "IS_ENABLED(CONFIG_KEXEC_CORE)", to simplify the code and
increase compile coverage.

Link: https://lkml.kernel.org/r/20211206160514.2000-4-jszhang@kernel.orgSigned-off-by: default avatarJisheng Zhang <jszhang@kernel.org>
Acked-by: default avatarBaoquan He <bhe@redhat.com>
Cc: Albert Ou <aou@eecs.berkeley.edu>
Cc: Alexandre Ghiti <alex@ghiti.fr>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Eric W. Biederman <ebiederm@xmission.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Palmer Dabbelt <palmer@rivosinc.com>
Cc: Paul Walmsley <paul.walmsley@sifive.com>
Cc: Russell King <linux@armlinux.org.uk>
Cc: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d414cb37
...@@ -411,8 +411,6 @@ static void __init memblock_x86_reserve_range_setup_data(void) ...@@ -411,8 +411,6 @@ static void __init memblock_x86_reserve_range_setup_data(void)
* --------- Crashkernel reservation ------------------------------ * --------- Crashkernel reservation ------------------------------
*/ */
#ifdef CONFIG_KEXEC_CORE
/* 16M alignment for crash kernel regions */ /* 16M alignment for crash kernel regions */
#define CRASH_ALIGN SZ_16M #define CRASH_ALIGN SZ_16M
...@@ -490,6 +488,9 @@ static void __init reserve_crashkernel(void) ...@@ -490,6 +488,9 @@ static void __init reserve_crashkernel(void)
bool high = false; bool high = false;
int ret; int ret;
if (!IS_ENABLED(CONFIG_KEXEC_CORE))
return;
total_mem = memblock_phys_mem_size(); total_mem = memblock_phys_mem_size();
/* crashkernel=XM */ /* crashkernel=XM */
...@@ -555,11 +556,6 @@ static void __init reserve_crashkernel(void) ...@@ -555,11 +556,6 @@ static void __init reserve_crashkernel(void)
crashk_res.end = crash_base + crash_size - 1; crashk_res.end = crash_base + crash_size - 1;
insert_resource(&iomem_resource, &crashk_res); insert_resource(&iomem_resource, &crashk_res);
} }
#else
static void __init reserve_crashkernel(void)
{
}
#endif
static struct resource standard_io_resources[] = { static struct resource standard_io_resources[] = {
{ .name = "dma1", .start = 0x00, .end = 0x1f, { .name = "dma1", .start = 0x00, .end = 0x1f,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment