| From: Baoquan He <bhe@redhat.com> |
| Subject: arm, crash: wrap crash dumping code into crash related ifdefs |
| Date: Wed, 24 Jan 2024 13:12:53 +0800 |
| |
| Now crash codes under kernel/ folder has been split out from kexec |
| code, crash dumping can be separated from kexec reboot in config |
| items on arm with some adjustments. |
| |
| Here use CONFIG_CRASH_RESERVE ifdef to replace CONFIG_KEXEC ifdef. |
| |
| Link: https://lkml.kernel.org/r/20240124051254.67105-14-bhe@redhat.com |
| Signed-off-by: Baoquan He <bhe@redhat.com> |
| Cc: Al Viro <viro@zeniv.linux.org.uk> |
| Cc: Eric W. Biederman <ebiederm@xmission.com> |
| Cc: Hari Bathini <hbathini@linux.ibm.com> |
| Cc: Pingfan Liu <piliu@redhat.com> |
| Cc: Klara Modin <klarasmodin@gmail.com> |
| Cc: Michael Kelley <mhklinux@outlook.com> |
| Cc: Nathan Chancellor <nathan@kernel.org> |
| Cc: Stephen Rothwell <sfr@canb.auug.org.au> |
| Cc: Yang Li <yang.lee@linux.alibaba.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| arch/arm/kernel/setup.c | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/arm/kernel/setup.c~arm-crash-wrap-crash-dumping-code-into-crash-related-ifdefs |
| +++ a/arch/arm/kernel/setup.c |
| @@ -979,7 +979,7 @@ static int __init init_machine_late(void |
| } |
| late_initcall(init_machine_late); |
| |
| -#ifdef CONFIG_KEXEC |
| +#ifdef CONFIG_CRASH_RESERVE |
| /* |
| * The crash region must be aligned to 128MB to avoid |
| * zImage relocating below the reserved region. |
| @@ -1066,7 +1066,7 @@ static void __init reserve_crashkernel(v |
| } |
| #else |
| static inline void reserve_crashkernel(void) {} |
| -#endif /* CONFIG_KEXEC */ |
| +#endif /* CONFIG_CRASH_RESERVE*/ |
| |
| void __init hyp_mode_check(void) |
| { |
| _ |
