From 7d3da8efe8752bfd1a790523578e79e1d81dba3e Mon Sep 17 00:00:00 2001 From: Don Zickus Date: Fri, 12 Feb 2010 17:19:18 -0500 Subject: [PATCH] --- yaml --- r: 205378 b: refs/heads/master c: c3128fb6ad39b0edda6675d20585a64846cf89ea h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/Kconfig | 1 + trunk/init/Kconfig | 5 +++++ trunk/lib/Kconfig.debug | 3 +-- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 00fad86c5a63..c66966b2ec20 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8e7672cdb413af859086ffceaed68f7e1e8ea4c2 +refs/heads/master: c3128fb6ad39b0edda6675d20585a64846cf89ea diff --git a/trunk/arch/x86/Kconfig b/trunk/arch/x86/Kconfig index cbcbfdee3ee0..4f9685fa3a3a 100644 --- a/trunk/arch/x86/Kconfig +++ b/trunk/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/trunk/init/Kconfig b/trunk/init/Kconfig index ada48441aff8..7331a16dd82c 100644 --- a/trunk/init/Kconfig +++ b/trunk/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/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index acef88239e15..01a4d85ee746 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/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