From dbd2c0f7a2ef93a232672db2eed1a5d269b4ab59 Mon Sep 17 00:00:00 2001
From: Cyrill Gorcunov <gorcunov@gmail.com>
Date: Wed, 4 Jun 2008 01:00:58 +0400
Subject: [PATCH] --- yaml --- r: 99818 b: refs/heads/master c:
 1a1b1d1322ebd1ece405f3057cdd408bc77e391d h: refs/heads/master v: v3

---
 [refs]                                       | 2 +-
 trunk/arch/x86/kernel/cpu/perfctr-watchdog.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 602801af90c7..a850a71acc82 100644
--- 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
index f9ae93adffe5..ddda4b64f545 100644
--- 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);
 }