arm64-mm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch removed from -mm tree
The patch titled
Subject: arm64: mm: use IS_ENABLED(CONFIG_KEXEC_CORE) instead of #ifdef
has been removed from the -mm tree. Its filename was
arm64-mm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Jisheng Zhang <[email protected]>
Subject: arm64: mm: 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.
Signed-off-by Jisheng Zhang <[email protected]>
Acked-by Catalin Marinas <[email protected]>
Acked-by Baoquan He <[email protected]>
Cc Albert Ou <[email protected]>
Cc Alexandre Ghiti <[email protected]>
Cc Borislav Petkov <[email protected]>
Cc Dave Hansen <[email protected]>
Cc Eric W. Biederman <[email protected]>
Cc H. Peter Anvin <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Palmer Dabbelt <[email protected]>
Cc Paul Walmsley <[email protected]>
Cc Russell King <[email protected]>
Cc Russell King (Oracle) <[email protected]>
Cc Thomas Gleixner <[email protected]>
Cc Will Deacon <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
arch/arm64/mm/init.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
arch/arm64/mm/init.c renamed from arch/arm64/mm/init.c~arm64-mm-use-is_enabledconfig_kexec_core-instead-of-ifdef +3 -6
@@ -64,7 +64,6 @@ EXPORT_SYMBOL(memstart_addr);*/ phys_addr_t arm64_dma_phys_limit__ro_after_init ; -#ifdef CONFIG_KEXEC_CORE /* * reserve_crashkernel() - reserves memory for crash kernel *
@@ -78,6 +77,9 @@ static void __init reserve_crashkernel(vunsigned long long crash_max = arm64_dma_phys_limit;int ret; +if (!IS_ENABLED (CONFIG_KEXEC_CORE )) +return ; + ret =parse_crashkernel (boot_command_line,memblock_phys_mem_size (), &crash_size, &crash_base);/* no crashkernel= or invalid value specified */
@@ -110,11 +112,6 @@ static void __init reserve_crashkernel(v crashk_res.start = crash_base; crashk_res.end = crash_base + crash_size -1 ; } -#else -static void __init reserve_crashkernel (void ) -{ -} -#endif /* CONFIG_KEXEC_CORE */ /* * Return the maximum physical address for a zone accessible by the given bits
_
Patches currently in -mm which might be from [email protected] are