diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2023-12-12 17:39:11 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-12-12 17:39:11 -0800 |
| commit | fc0fbad122a7609d785ee754c2b6e1e3265547d0 (patch) | |
| tree | 08bd3249feb7c54f151a99a24a08398f3eb8e9f5 /arch/mips/include/asm | |
| parent | e52ec6a2db2e01e6a8cdfbe4fee1f89f57cdf723 (diff) | |
| parent | 4376807bf2d5371c3e00080c972be568c3f8a7d1 (diff) | |
merge mm-hotfixes-stable into mm-nonmm-stable to pick up depended-upon changes
Diffstat (limited to 'arch/mips/include/asm')
| -rw-r--r-- | arch/mips/include/asm/kexec.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/smp-ops.h | 2 | ||||
| -rw-r--r-- | arch/mips/include/asm/smp.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/mips/include/asm/kexec.h b/arch/mips/include/asm/kexec.h index d6d5fa5cc31d..69e579e41e66 100644 --- a/arch/mips/include/asm/kexec.h +++ b/arch/mips/include/asm/kexec.h @@ -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 *); diff --git a/arch/mips/include/asm/smp-ops.h b/arch/mips/include/asm/smp-ops.h index 5719ff49eff1..0c59e168f800 100644 --- a/arch/mips/include/asm/smp-ops.h +++ b/arch/mips/include/asm/smp-ops.h @@ -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 }; diff --git a/arch/mips/include/asm/smp.h b/arch/mips/include/asm/smp.h index bfb1ec86fb84..695928637db4 100644 --- a/arch/mips/include/asm/smp.h +++ b/arch/mips/include/asm/smp.h @@ -95,7 +95,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 */ |