From: Ingo Molnar <mingo@elte.hu>

The NMI watchdog uses spinlocks (notifier chains, etc.), so it's not
lockdep-safe at the moment.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
---

 arch/x86_64/kernel/nmi.c |   12 ++++++++++++
 1 file changed, 12 insertions(+)

diff -puN arch/x86_64/kernel/nmi.c~lock-validator-disable-nmi-watchdog-if-config_lockdep arch/x86_64/kernel/nmi.c
--- devel/arch/x86_64/kernel/nmi.c~lock-validator-disable-nmi-watchdog-if-config_lockdep	2006-06-02 19:00:26.000000000 -0700
+++ devel-akpm/arch/x86_64/kernel/nmi.c	2006-06-02 19:00:26.000000000 -0700
@@ -215,6 +215,18 @@ int __init check_nmi_watchdog (void)
 	int *counts;
 	int cpu;
 
+#ifdef CONFIG_LOCKDEP
+	/*
+	 * The NMI watchdog uses spinlocks (notifier chains, etc.),
+	 * so it's not lockdep-safe:
+	 */
+	nmi_watchdog = 0;
+	for_each_online_cpu(cpu)
+		per_cpu(nmi_watchdog_ctlblk.enabled, cpu) = 0;
+
+	printk("lockdep: disabled NMI watchdog.\n");
+	return 0;
+#endif
 	if ((nmi_watchdog == NMI_NONE) || (nmi_watchdog == NMI_DEFAULT))
 		return 0;
 
_