* [PATCH] arm64: fix HARDLOCKUP_DETECTOR dependency
@ 2020-12-03 22:27 Arnd Bergmann
2020-12-04 9:27 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Arnd Bergmann @ 2020-12-03 22:27 UTC (permalink / raw)
To: Catalin Marinas, Will Deacon, Sumit Garg, Alexandru Elisei
Cc: Arnd Bergmann, Andrew Morton, Vincenzo Frascino, Mark Brown,
linux-arm-kernel, linux-kernel
From: Arnd Bergmann <arnd@arndb.de>
When CONFIG_HW_PERF_EVENTS is disabled, the hardware lockup detector
fails to link:
ld.lld: error: undefined symbol: hw_nmi_get_sample_period
>>> 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")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
arch/arm64/Kconfig | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 7599ad86e9a8..ecd900ad7755 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -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
--
2.27.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] arm64: fix HARDLOCKUP_DETECTOR dependency
2020-12-03 22:27 [PATCH] arm64: fix HARDLOCKUP_DETECTOR dependency Arnd Bergmann
@ 2020-12-04 9:27 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2020-12-04 9:27 UTC (permalink / raw)
To: Arnd Bergmann
Cc: Catalin Marinas, Sumit Garg, Alexandru Elisei, Arnd Bergmann,
Andrew Morton, Vincenzo Frascino, Mark Brown, linux-arm-kernel,
linux-kernel
Hi Arnd,
On Thu, Dec 03, 2020 at 11:27:26PM +0100, Arnd Bergmann wrote:
> From: Arnd Bergmann <arnd@arndb.de>
>
> When CONFIG_HW_PERF_EVENTS is disabled, the hardware lockup detector
> fails to link:
>
> ld.lld: error: undefined symbol: hw_nmi_get_sample_period
> >>> 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")
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> arch/arm64/Kconfig | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 7599ad86e9a8..ecd900ad7755 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -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/202012031509.4O5ZoWNI-lkp@intel.com
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-12-04 9:27 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-12-03 22:27 [PATCH] arm64: fix HARDLOCKUP_DETECTOR dependency Arnd Bergmann
2020-12-04 9:27 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).