3 files changed, 7 insertions, 2 deletions

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cbcbfdee3ee0..4f9685fa3a3a 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -52,6 +52,7 @@ config X86
         select HAVE_KERNEL_LZO
         select HAVE_HW_BREAKPOINT
         select PERF_EVENTS
+        select PERF_EVENTS_NMI
         select ANON_INODES
         select HAVE_ARCH_KMEMCHECK
         select HAVE_USER_RETURN_NOTIFIER
diff --git a/init/Kconfig b/init/Kconfig
index ada48441aff8..7331a16dd82c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -946,6 +946,11 @@ config PERF_USE_VMALLOC
         help
           See tools/perf/design.txt for details
 
+config PERF_EVENTS_NMI
+        bool
+        help
+          Arch has support for nmi_watchdog
+
 menu "Kernel Performance Events And Counters"
 
 config PERF_EVENTS
diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug
index acef88239e15..01a4d85ee746 100644
--- a/lib/Kconfig.debug
+++ b/lib/Kconfig.debug
@@ -172,8 +172,7 @@ config DETECT_SOFTLOCKUP
 
 config NMI_WATCHDOG
         bool "Detect Hard Lockups with an NMI Watchdog"
-        depends on DEBUG_KERNEL && PERF_EVENTS
-        depends on X86
+        depends on DEBUG_KERNEL && PERF_EVENTS && PERF_EVENTS_NMI
         default y
         help
           Say Y here to enable the kernel to use the NMI as a watchdog