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

mips, 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
===

--------------------------------------------------------------------
mipsel-linux-ld: kernel/kexec_core.o: in function `kimage_free':
kernel/kexec_core.c:(.text+0x2200): undefined reference to `machine_kexec_cleanup'
mipsel-linux-ld: kernel/kexec_core.o: in function `__crash_kexec':
kernel/kexec_core.c:(.text+0x2480): undefined reference to `machine_crash_shutdown'
mipsel-linux-ld: kernel/kexec_core.c:(.text+0x2488): undefined reference to `machine_kexec'
mipsel-linux-ld: kernel/kexec_core.o: in function `kernel_kexec':
kernel/kexec_core.c:(.text+0x29b8): undefined reference to `machine_shutdown'
mipsel-linux-ld: kernel/kexec_core.c:(.text+0x29c0): undefined reference to `machine_kexec'
--------------------------------------------------------------------

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

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


Signed-off-by: default avatarBaoquan He <bhe@redhat.com>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202311302042.sn8cDPIX-lkp@intel.com/


Cc: Eric DeVolder <eric_devolder@yahoo.com>
Cc: Ignat Korchagin <ignat@cloudflare.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9bad6b75

arch/mips/cavium-octeon/smp.c

+2 −2
Original line number Diff line number Diff line
@@ -422,7 +422,7 @@ static const struct plat_smp_ops octeon_smp_ops = { 
	.cpu_disable		= octeon_cpu_disable,

	.cpu_die		= octeon_cpu_die,

#endif

#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	.kexec_nonboot_cpu	= kexec_nonboot_cpu_jump,

#endif

};
@@ -502,7 +502,7 @@ static const struct plat_smp_ops octeon_78xx_smp_ops = { 
	.cpu_disable		= octeon_cpu_disable,

	.cpu_die		= octeon_cpu_die,

#endif

#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	.kexec_nonboot_cpu	= kexec_nonboot_cpu_jump,

#endif

};

arch/mips/include/asm/kexec.h

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static inline void crash_setup_regs(struct pt_regs *newregs, 
		prepare_frametrace(newregs);

}



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

struct kimage;

extern unsigned long kexec_args[4];

extern int (*_machine_kexec_prepare)(struct kimage *);

arch/mips/include/asm/smp-ops.h

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ struct plat_smp_ops { 
	void (*cpu_die)(unsigned int cpu);

	void (*cleanup_dead_cpu)(unsigned cpu);

#endif

#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	void (*kexec_nonboot_cpu)(void);

#endif

};

arch/mips/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ static inline void __cpu_die(unsigned int cpu) 
extern void __noreturn play_dead(void);

#endif



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

static inline void kexec_nonboot_cpu(void)

{

	extern const struct plat_smp_ops *mp_ops;	/* private */

arch/mips/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -90,7 +90,7 @@ obj-$(CONFIG_GPIO_TXX9) += gpio_txx9.o 


obj-$(CONFIG_RELOCATABLE)	+= relocate.o



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

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

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump.o

obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o

obj-$(CONFIG_EARLY_PRINTK_8250)	+= early_printk_8250.o