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

sh, kexec: fix the incorrect ifdeffery and dependency of CONFIG_KEXEC 

The select of KEXEC for CRASH_DUMP in kernel/Kconfig.kexec will be
dropped, then compiling errors will be triggered if below config
items are set:

===
CONFIG_CRASH_CORE=y
CONFIG_KEXEC_CORE=y
CONFIG_CRASH_DUMP=y
===

Here, change the dependency of building kexec_core related object files,
and the ifdeffery on SuperH from CONFIG_KEXEC to CONFIG_KEXEC_CORE.

Link: https://lkml.kernel.org/r/20231208073036.7884-5-bhe@redhat.com


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Cc: Eric DeVolder <eric_devolder@yahoo.com>
Cc: Ignat Korchagin <ignat@cloudflare.com>
Cc: kernel test robot <lkp@intel.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 8cd2accb

arch/sh/include/asm/kexec.h

+2 −2
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
/* The native architecture */

#define KEXEC_ARCH KEXEC_ARCH_SH



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

/* arch/sh/kernel/machine_kexec.c */

void reserve_crashkernel(void);
@@ -67,6 +67,6 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
}

#else

static inline void reserve_crashkernel(void) { }

#endif /* CONFIG_KEXEC */

#endif /* CONFIG_KEXEC_CORE */



#endif /* __ASM_SH_KEXEC_H */

arch/sh/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ obj-$(CONFIG_SMP) += smp.o 
obj-$(CONFIG_SH_STANDARD_BIOS)	+= sh_bios.o

obj-$(CONFIG_KGDB)		+= kgdb.o

obj-$(CONFIG_MODULES)		+= sh_ksyms_32.o module.o

obj-$(CONFIG_KEXEC)		+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_KEXEC_CORE)	+= machine_kexec.o relocate_kernel.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_STACKTRACE)	+= stacktrace.o

obj-$(CONFIG_IO_TRAPPED)	+= io_trapped.o

arch/sh/kernel/reboot.c

+2 −2
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ struct machine_ops machine_ops = { 
	.shutdown	= native_machine_shutdown,

	.restart	= native_machine_restart,

	.halt		= native_machine_halt,

#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	.crash_shutdown = native_machine_crash_shutdown,

#endif

};
@@ -88,7 +88,7 @@ void machine_halt(void) 
	machine_ops.halt();

}



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

void machine_crash_shutdown(struct pt_regs *regs)

{

	machine_ops.crash_shutdown(regs);

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

#ifdef CONFIG_KEXEC_CORE

	request_resource(res, &crashk_res);

#endif