Commit ce4b2c01 authored Dec 04, 2020 by Will Deacon

arm64: Fix build failure when HARDLOCKUP_DETECTOR_PERF is enabled



If HARDLOCKUP_DETECTOR_PERF is selected but HW_PERF_EVENTS is not, then
the associated watchdog driver will fail to link:

  |    aarch64-linux-ld: Unexpected GOT/PLT entries detected!
  |    aarch64-linux-ld: Unexpected run-time procedure linkages detected!
  |    aarch64-linux-ld: kernel/watchdog_hld.o: in function `hardlockup_detector_event_create':
  | >> watchdog_hld.c:(.text+0x68): undefined reference to `hw_nmi_get_sample_period

Change the Kconfig dependencies so that HAVE_PERF_EVENTS_NMI requires
the hardware PMU driver to be enabled, ensuring that the required
symbols are present.

Cc: Sumit Garg <sumit.garg@linaro.org>
Reported-by: kernel test robot <lkp@intel.com>
Link: https://lore.kernel.org/r/202012031509.4O5ZoWNI-lkp@intel.com


Fixes: 367c820e ("arm64: Enable perf events based hard lockup detector")
Signed-off-by: Will Deacon <will@kernel.org>

parent 367c820e

arch/arm64/Kconfig

+1 −1

Original line number	Diff line number	Diff line
		@@ -170,7 +170,7 @@ config ARM64
		select HAVE_NMI
		select HAVE_PATA_PLATFORM
		select HAVE_PERF_EVENTS
		select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI
		select HAVE_PERF_EVENTS_NMI if ARM64_PSEUDO_NMI && HW_PERF_EVENTS
		select HAVE_HARDLOCKUP_DETECTOR_PERF if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
		select HAVE_PERF_REGS
		select HAVE_PERF_USER_STACK_DUMP

Admin message