diff --git a/[refs] b/[refs]
index 3ea48f4cb7e9..bf01d37e28b7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e16bb1d7fe07609bc8b0e4c043eff2f47ada78d8
+refs/heads/master: c01d4323309a90a298fd81cf3a059ee1b12be2e9
diff --git a/trunk/arch/Kconfig b/trunk/arch/Kconfig
index e5eb1337a537..89b0efb50948 100644
--- a/trunk/arch/Kconfig
+++ b/trunk/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/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig
index 3cb28cd1f551..3cb5bb02172b 100644
--- a/trunk/arch/x86/Kconfig
+++ b/trunk/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/trunk/init/Kconfig b/trunk/init/Kconfig
index e44e25422f22..ab733c32292c 100644
--- a/trunk/init/Kconfig
+++ b/trunk/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