diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index bc94a9ee305bbb49de132380c615c2729b4a8c16..999675d33000c67b2df60e68d1ef9a95af2f4c4f 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -172,7 +172,6 @@ config ARM64
 	select HAVE_NMI
 	select HAVE_PATA_PLATFORM
 	select HAVE_PERF_EVENTS
-	select HAVE_HARDLOCKUP_DETECTOR_PERF	if PERF_EVENTS && HAVE_PERF_EVENTS_NMI
 	select HAVE_PERF_REGS
 	select HAVE_PERF_USER_STACK_DUMP
 	select HAVE_REGS_AND_STACK_ACCESS_API
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index 7dd44d922ea994ba4cc1349565e02f67fa729ad5..a7dd39c792e07932f966d471bdbe99e555137e49 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -964,12 +964,25 @@ config HARDLOCKUP_DETECTOR_PERF
 	bool
 	select SOFTLOCKUP_DETECTOR
 
+choice
+	prompt "aarch64 NMI watchdog method"
+	depends on ARM64
+	help
+	  Watchdog implementation method configuration.
+
 config SDEI_WATCHDOG
 	bool "SDEI NMI Watchdog support"
 	depends on ARM_SDE_INTERFACE && !HARDLOCKUP_CHECK_TIMESTAMP
 	select HAVE_HARDLOCKUP_DETECTOR_ARCH
 	select HARDLOCKUP_DETECTOR
 
+config PMU_WATCHDOG
+	bool "PMU NMI Watchdog support"
+	depends on PERF_EVENTS && HAVE_PERF_EVENTS_NMI
+	select HAVE_HARDLOCKUP_DETECTOR_PERF
+
+endchoice
+
 #
 # Enables a timestamp based low pass filter to compensate for perf based
 # hard lockup detection which runs too fast due to turbo modes.