Commit e3892635 authored by Baoquan He's avatar Baoquan He Committed by Andrew Morton
Browse files

sh, crash: wrap crash dumping code into crash related ifdefs 

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 SuperH with some adjustments.

Wrap up crash dumping codes with CONFIG_CRASH_DUMP ifdeffery, and use
IS_ENABLED(CONFIG_CRASH_RESERVE) check to decide if compiling in the
crashkernel reservation code.

Link: https://lkml.kernel.org/r/20240124051254.67105-11-bhe@redhat.com


Signed-off-by: default avatarBaoquan 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: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 865e2acd

arch/sh/kernel/machine_kexec.c

+3 −0
Original line number Diff line number Diff line
@@ -153,6 +153,9 @@ void __init reserve_crashkernel(void) 
	unsigned long long crash_size, crash_base;

	int ret;



	if (!IS_ENABLED(CONFIG_CRASH_RESERVE))

		return;



	ret = parse_crashkernel(boot_command_line, memblock_phys_mem_size(),

			&crash_size, &crash_base, NULL, NULL);

	if (ret == 0 && crash_size > 0) {

arch/sh/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ void __init __add_active_range(unsigned int nid, unsigned long start_pfn, 
	request_resource(res, &code_resource);

	request_resource(res, &data_resource);

	request_resource(res, &bss_resource);

#ifdef CONFIG_KEXEC_CORE

#ifdef CONFIG_CRASH_RESERVE

	request_resource(res, &crashk_res);

#endif