3 files changed, 5 insertions, 3 deletions

diff --git a/arch/Kconfig b/arch/Kconfig
index e5eb1337a537..89b0efb50948 100644
--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -145,4 +145,7 @@ config HAVE_HW_BREAKPOINT
 config HAVE_USER_RETURN_NOTIFIER
         bool
 
+config HAVE_PERF_EVENTS_NMI
+        bool
+
 source "kernel/gcov/Kconfig"
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 3cb28cd1f551..3cb5bb02172b 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -54,7 +54,7 @@ config X86
         select HAVE_KERNEL_LZO
         select HAVE_HW_BREAKPOINT
         select PERF_EVENTS
-        select PERF_EVENTS_NMI
+        select HAVE_PERF_EVENTS_NMI
         select ANON_INODES
         select HAVE_ARCH_KMEMCHECK
         select HAVE_USER_RETURN_NOTIFIER
diff --git a/init/Kconfig b/init/Kconfig
index e44e25422f22..ab733c32292c 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -943,8 +943,7 @@ config PERF_USE_VMALLOC
           See tools/perf/design.txt for details
 
 config PERF_EVENTS_NMI
-        bool
-        depends on PERF_EVENTS
+        def_bool PERF_EVENTS && HAVE_PERF_EVENTS_NMI
         help
           System hardware can generate an NMI using the perf event
           subsystem.  Also has support for calculating CPU cycle events