* [failures] arm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch removed from -mm tree
@ 2022-01-28 21:37 akpm
2022-01-29 3:27 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: akpm @ 2022-01-28 21:37 UTC (permalink / raw)
To: mm-commits, will, tglx, sfr, rmk+kernel, paul.walmsley, palmer,
palmer, mingo, linux, hpa, ebiederm, dave.hansen, catalin.marinas,
bp, bhe, aou, alex, jszhang
The patch titled
Subject: arm: use IS_ENABLED(CONFIG_KEXEC_CORE) instead of #ifdef
has been removed from the -mm tree. Its filename was
arm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch
This patch was dropped because it had testing failures
------------------------------------------------------
From: Jisheng Zhang <jszhang@kernel.org>
Subject: arm: 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-6-jszhang@kernel.org
Signed-off-by: Jisheng Zhang <jszhang@kernel.org>
Reviewed-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk>
Acked-by: Baoquan 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: Thomas Gleixner <tglx@linutronix.de>
Cc: Will Deacon <will@kernel.org>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
arch/arm/kernel/setup.c | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
--- a/arch/arm/kernel/setup.c~arm-use-is_enabledconfig_kexec_core-instead-of-ifdef
+++ a/arch/arm/kernel/setup.c
@@ -973,7 +973,6 @@ static int __init init_machine_late(void
}
late_initcall(init_machine_late);
-#ifdef CONFIG_KEXEC
/*
* The crash region must be aligned to 128MB to avoid
* zImage relocating below the reserved region.
@@ -1001,6 +1000,9 @@ static void __init reserve_crashkernel(v
unsigned long long total_mem;
int ret;
+ if (!IS_ENABLED(CONFIG_KEXEC_CORE))
+ return;
+
total_mem = get_total_mem();
ret = parse_crashkernel(boot_command_line, total_mem,
&crash_size, &crash_base);
@@ -1056,9 +1058,6 @@ static void __init reserve_crashkernel(v
insert_resource(&iomem_resource, &crashk_boot_res);
}
}
-#else
-static inline void reserve_crashkernel(void) {}
-#endif /* CONFIG_KEXEC */
void __init hyp_mode_check(void)
{
_
Patches currently in -mm which might be from jszhang@kernel.org are
kexec-make-crashk_res-crashk_low_res-and-crash_notes-symbols-always-visible.patch
riscv-mm-init-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch
x86-setup-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch
arm64-mm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [failures] arm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch removed from -mm tree
2022-01-28 21:37 [failures] arm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch removed from -mm tree akpm
@ 2022-01-29 3:27 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2022-01-29 3:27 UTC (permalink / raw)
To: akpm
Cc: mm-commits, will, tglx, rmk+kernel, paul.walmsley, palmer, palmer,
mingo, linux, hpa, ebiederm, dave.hansen, catalin.marinas, bp,
bhe, aou, alex, jszhang
[-- Attachment #1: Type: text/plain, Size: 524 bytes --]
Hi all,
On Fri, 28 Jan 2022 13:37:50 -0800 akpm@linux-foundation.org wrote:
>
> The patch titled
> Subject: arm: use IS_ENABLED(CONFIG_KEXEC_CORE) instead of #ifdef
> has been removed from the -mm tree. Its filename was
> arm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch
>
> This patch was dropped because it had testing failures
Removed from the linux-next akpm-current tree as well.
I clearly need to remember to read all my email before replying :-)
--
Cheers,
Stephen Rothwell
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2022-01-29 3:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-01-28 21:37 [failures] arm-use-is_enabledconfig_kexec_core-instead-of-ifdef.patch removed from -mm tree akpm
2022-01-29 3:27 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox