From e094cb3488c0f7fc1acca3d5f9fdbb893f23eb05 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 28 Feb 2010 20:49:00 +0100
Subject: [PATCH] --- yaml --- r: 205385 b: refs/heads/master c:
 c99c30feadf664ccd8590b96259cb9f3954bd246 h: refs/heads/master i:   205383:
 489ae815b0f301001da1661798f554d1961a76c5 v: v3

---
 [refs]                  | 2 +-
 trunk/lib/Kconfig.debug | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 197d2514f948..dae8698ea964 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 47195d57636604ff6048b0d7aa3e4ed9643f6073
+refs/heads/master: c99c30feadf664ccd8590b96259cb9f3954bd246
diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug
index 01a4d85ee746..e2e73cc17a91 100644
--- a/trunk/lib/Kconfig.debug
+++ b/trunk/lib/Kconfig.debug
@@ -173,7 +173,6 @@ config DETECT_SOFTLOCKUP
 config NMI_WATCHDOG
 	bool "Detect Hard Lockups with an NMI Watchdog"
 	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 detect hard lockups.  This is useful when a cpu hangs for no