Skip to contentSkip to conversation

arm64: fix HARDLOCKUP_DETECTOR dependency

PATCH In review Arnd Bergmann 2 participants 2 messages Dec 3, 2020 – Dec 4, 2020 arm64

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 arm64: fix HARDLOCKUP_DETECTOR dependency

From: Arnd Bergmann <[email protected]>

When CONFIG_HW_PERF_EVENTS is disabled, the hardware lockup detector fails to link:

ld.lld: error: undefined symbol: hw_nmi_get_sample_period

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by watchdog_hld.c
watchdog_hld.o:(hardlockup_detector_event_create) in archive kernel/built-in.a

Fix the dependency to refer to the Kconfig symbol that actually controls the feature.

Fixes 367c820ef080 ("arm64: Enable perf events based hard lockup detector")
---
 arch/arm64/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Kconfig +1 -1
index 7599ad86e9a8..ecd900ad7755 100644
@@ -176,7 +176,7 @@ config ARM64
 	select HAVE_PATA_PLATFORM
 	select HAVE_PERF_EVENTS
 	select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI
-	select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+	select HAVE_HARDLOCKUP_DETECTOR_PERF if HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI
 	select HAVE_PERF_REGS
 	select HAVE_PERF_USER_STACK_DUMP
 	select HAVE_REGS_AND_STACK_ACCESS_API
Signature · 1 line
2.27.0
maintainer
#1 lore raw

Hi Arnd,

Quoted 23 lines · Arnd Bergmann

From: Arnd Bergmann <[email protected]>

When CONFIG_HW_PERF_EVENTS is disabled, the hardware lockup detector fails to link:

ld.lld: error: undefined symbol: hw_nmi_get_sample_period

Quoted 2 lines
Quoted 2 lines
Quoted 2 lines

referenced by watchdog_hld.c
watchdog_hld.o:(hardlockup_detector_event_create) in archive kernel/built-in.a

Fix the dependency to refer to the Kconfig symbol that actually controls the feature.

Fixes 367c820ef080 ("arm64: Enable perf events based hard lockup detector")
---
 arch/arm64/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm64/Kconfig +0 -0
index 7599ad86e9a8..ecd900ad7755 100644

arch/arm64/Kconfig config ARM64 · line 182

Quoted 8 lines
arch/arm64/Kconfig +1 -1
@@ -176,7 +176,7 @@ config ARM64
 	select HAVE_PATA_PLATFORM
 	select HAVE_PERF_EVENTS
 	select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI
-	select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+	select HAVE_HARDLOCKUP_DETECTOR_PERF if HW_PERF_EVENTS && HAVE_PERF_EVENTS_NMI
 	select HAVE_PERF_REGS
 	select HAVE_PERF_USER_STACK_DUMP
 	select HAVE_REGS_AND_STACK_ACCESS_API

Cheers, although I already have a fix for this one queued locally [1]. I'll push it out in sec (ran out of time yesterday).

Will

[1] https://lore.kernel.org/r/[email protected]