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/smp.h | |
| 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/smp.h')
| -rw-r--r-- | arch/mips/include/asm/smp.h | 2 |
1 files changed, 1 insertions, 1 deletions
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 */ |