---

yaml --- r: 99818 b: refs/heads/master c: 1a1b1d1 h: refs/heads/master v: v3
git-mirror · Jun 5, 2008 · dbd2c0f · dbd2c0f
1 parent 9788964
commit dbd2c0f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3ed3f06295e69700fa808396f7b350bff2b69de0
+refs/heads/master: 1a1b1d1322ebd1ece405f3057cdd408bc77e391d
diff --git a/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c b/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -181,7 +181,9 @@ void disable_lapic_nmi_watchdog(void)
 		return;
 
 	on_each_cpu(stop_apic_nmi_watchdog, NULL, 0, 1);
-	wd_ops->unreserve();
+
+	if (wd_ops)
+		wd_ops->unreserve();
 
 	BUG_ON(atomic_read(&nmi_active) != 0);
 }