[tip:perf/nmi] nmi_watchdog: Use a boolean config flag for compiling

From: tip-bot for Don Zickus
Date: Sun Feb 14 2010 - 04:13:47 EST


Commit-ID: c3128fb6ad39b0edda6675d20585a64846cf89ea
Gitweb: http://git.kernel.org/tip/c3128fb6ad39b0edda6675d20585a64846cf89ea
Author: Don Zickus <dzickus@xxxxxxxxxx>
AuthorDate: Fri, 12 Feb 2010 17:19:18 -0500
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 14 Feb 2010 09:19:43 +0100

nmi_watchdog: Use a boolean config flag for compiling

Determines if an arch has setup arch specific perf_events and
nmi_watchdog code. This should restrict compiles to only those
arches ready.

Signed-off-by: Don Zickus <dzickus@xxxxxxxxxx>
Cc: peterz@xxxxxxxxxxxxx
Cc: gorcunov@xxxxxxxxx
Cc: aris@xxxxxxxxxx
LKML-Reference: <1266013161-31197-1-git-send-email-dzickus@xxxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
arch/x86/Kconfig | 1 +
init/Kconfig | 5 +++++
lib/Kconfig.debug | 3 +--
3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index cbcbfde..4f9685f 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 ada4844..7331a16 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 acef882..01a4d85 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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/