From 179098248aae9eef8296d1234cc455ff51ec9c56 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Tue, 9 Feb 2010 06:11:00 +0100 Subject: [PATCH] --- yaml --- r: 205377 b: refs/heads/master c: 8e7672cdb413af859086ffceaed68f7e1e8ea4c2 h: refs/heads/master i: 205375: 71a48e81b501281d735f79a073a1af9544abd021 v: v3 --- [refs] | 2 +- trunk/lib/Kconfig.debug | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 90529e849f0a..00fad86c5a63 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 84e478c6f1eb9c4bfa1fff2f8108e9a061b46428 +refs/heads/master: 8e7672cdb413af859086ffceaed68f7e1e8ea4c2 diff --git a/trunk/lib/Kconfig.debug b/trunk/lib/Kconfig.debug index f80b67e72aa0..acef88239e15 100644 --- a/trunk/lib/Kconfig.debug +++ b/trunk/lib/Kconfig.debug @@ -173,6 +173,7 @@ config DETECT_SOFTLOCKUP config NMI_WATCHDOG bool "Detect Hard Lockups with an NMI Watchdog" depends on DEBUG_KERNEL && PERF_EVENTS + depends on X86 default y help Say Y here to enable the kernel to use the NMI as a watchdog