Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit da665885 authored by Thiago Jung Bauermann's avatar Thiago Jung Bauermann Committed by Michael Ellerman
Browse files

powerpc: Change places using CONFIG_KEXEC to use CONFIG_KEXEC_CORE instead. 



Commit 2965faa5 ("kexec: split kexec_load syscall from kexec core
code") introduced CONFIG_KEXEC_CORE so that CONFIG_KEXEC means whether
the kexec_load system call should be compiled-in and CONFIG_KEXEC_FILE
means whether the kexec_file_load system call should be compiled-in.
These options can be set independently from each other.

Since until now powerpc only supported kexec_load, CONFIG_KEXEC and
CONFIG_KEXEC_CORE were synonyms. That is not the case anymore, so we
need to make a distinction. Almost all places where CONFIG_KEXEC was
being used should be using CONFIG_KEXEC_CORE instead, since
kexec_file_load also needs that code compiled in.

Signed-off-by: default avatarThiago Jung Bauermann <bauerman@linux.vnet.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent e2e806f9

arch/powerpc/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ config CRASH_DUMP 


config FA_DUMP

	bool "Firmware-assisted dump"

	depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC

	depends on PPC64 && PPC_RTAS && CRASH_DUMP && KEXEC_CORE

	help

	  A robust mechanism to get reliable kernel crash dump with

	  assistance from firmware. This approach does not use kexec,

arch/powerpc/include/asm/debug.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ struct pt_regs; 


extern struct dentry *powerpc_debugfs_root;



#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC)

#if defined(CONFIG_DEBUGGER) || defined(CONFIG_KEXEC_CORE)



extern int (*__debugger)(struct pt_regs *regs);

extern int (*__debugger_ipi)(struct pt_regs *regs);

arch/powerpc/include/asm/kexec.h

+3 −3
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 


typedef void (*crash_shutdown_t)(void);



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE



/*

 * This function is responsible for capturing register states if coming
@@ -91,7 +91,7 @@ static inline bool kdump_in_progress(void) 
	return crashing_cpu >= 0;

}



#else /* !CONFIG_KEXEC */

#else /* !CONFIG_KEXEC_CORE */

static inline void crash_kexec_secondary(struct pt_regs *regs) { }



static inline int overlaps_crashkernel(unsigned long start, unsigned long size)
@@ -116,7 +116,7 @@ static inline bool kdump_in_progress(void) 
	return false;

}



#endif /* CONFIG_KEXEC */

#endif /* CONFIG_KEXEC_CORE */

#endif /* ! __ASSEMBLY__ */

#endif /* __KERNEL__ */

#endif /* _ASM_POWERPC_KEXEC_H */

arch/powerpc/include/asm/machdep.h

+2 −2
Original line number Diff line number Diff line
@@ -183,7 +183,7 @@ struct machdep_calls { 
	 */

	void (*machine_shutdown)(void);



#ifdef CONFIG_KEXEC

#ifdef CONFIG_KEXEC_CORE

	void (*kexec_cpu_down)(int crash_shutdown, int secondary);



	/* Called to do what every setup is needed on image and the
@@ -198,7 +198,7 @@ struct machdep_calls { 
	 * no return.

	 */

	void (*machine_kexec)(struct kimage *image);

#endif /* CONFIG_KEXEC */

#endif /* CONFIG_KEXEC_CORE */



#ifdef CONFIG_SUSPEND

	/* These are called to disable and enable, respectively, IRQs when

arch/powerpc/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -176,7 +176,7 @@ static inline void set_hard_smp_processor_id(int cpu, int phys) 
#endif /* !CONFIG_SMP */

#endif /* !CONFIG_PPC64 */



#if defined(CONFIG_PPC64) && (defined(CONFIG_SMP) || defined(CONFIG_KEXEC))

#if defined(CONFIG_PPC64) && (defined(CONFIG_SMP) || defined(CONFIG_KEXEC_CORE))

extern void smp_release_cpus(void);

#else

static inline void smp_release_cpus(void) { };