| From e8a6a4513a437bf3432e3ca0f1b7468b1bcb4687 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Sat, 27 Mar 2021 09:49:00 +0000 |
| Subject: powerpc: Fix HAVE_HARDLOCKUP_DETECTOR_ARCH build configuration |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Chen Huang <chenhuang5@huawei.com> |
| |
| [ Upstream commit 4fe529449d85e78972fa327999961ecc83a0b6db ] |
| |
| When compiling the powerpc with the SMP disabled, it shows the issue: |
| |
| arch/powerpc/kernel/watchdog.c: In function ‘watchdog_smp_panic’: |
| arch/powerpc/kernel/watchdog.c:177:4: error: implicit declaration of function ‘smp_send_nmi_ipi’; did you mean ‘smp_send_stop’? [-Werror=implicit-function-declaration] |
| 177 | smp_send_nmi_ipi(c, wd_lockup_ipi, 1000000); |
| | ^~~~~~~~~~~~~~~~ |
| | smp_send_stop |
| cc1: all warnings being treated as errors |
| make[2]: *** [scripts/Makefile.build:273: arch/powerpc/kernel/watchdog.o] Error 1 |
| make[1]: *** [scripts/Makefile.build:534: arch/powerpc/kernel] Error 2 |
| make: *** [Makefile:1980: arch/powerpc] Error 2 |
| make: *** Waiting for unfinished jobs.... |
| |
| We found that powerpc used ipi to implement hardlockup watchdog, so the |
| HAVE_HARDLOCKUP_DETECTOR_ARCH should depend on the SMP. |
| |
| Fixes: 2104180a5369 ("powerpc/64s: implement arch-specific hardlockup watchdog") |
| Reported-by: Hulk Robot <hulkci@huawei.com> |
| Signed-off-by: Chen Huang <chenhuang5@huawei.com> |
| Signed-off-by: Michael Ellerman <mpe@ellerman.id.au> |
| Link: https://lore.kernel.org/r/20210327094900.938555-1-chenhuang5@huawei.com |
| Signed-off-by: Sasha Levin <sashal@kernel.org> |
| --- |
| arch/powerpc/Kconfig | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig |
| index a685e42d3993..fa4c6fa3fd06 100644 |
| --- a/arch/powerpc/Kconfig |
| +++ b/arch/powerpc/Kconfig |
| @@ -225,7 +225,7 @@ config PPC |
| select HAVE_LIVEPATCH if HAVE_DYNAMIC_FTRACE_WITH_REGS |
| select HAVE_MOD_ARCH_SPECIFIC |
| select HAVE_NMI if PERF_EVENTS || (PPC64 && PPC_BOOK3S) |
| - select HAVE_HARDLOCKUP_DETECTOR_ARCH if (PPC64 && PPC_BOOK3S) |
| + select HAVE_HARDLOCKUP_DETECTOR_ARCH if PPC64 && PPC_BOOK3S && SMP |
| select HAVE_OPROFILE |
| select HAVE_OPTPROBES if PPC64 |
| select HAVE_PERF_EVENTS |
| -- |
| 2.30.2 |
| |
