From 9b37e63f2bb6d2028650bfa62890df8c56e7d3d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Steinbrink?= <B.Steinbrink@gmx.de>
Date: Sat, 16 Jun 2007 10:15:55 -0700
Subject: [PATCH] --- yaml --- r: 57832 b: refs/heads/master c:
 faa4cfa6b334fc07c3386e620a2fb55de508c077 h: refs/heads/master v: v3

---
 [refs]                                        | 2 +-
 trunk/arch/i386/kernel/cpu/perfctr-watchdog.c | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index a679cbe8b043..898610c53911 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 38ad2ed08d89a4b830a03131fa73e4ef3e98d9f4
+refs/heads/master: faa4cfa6b334fc07c3386e620a2fb55de508c077
diff --git a/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c b/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c
index 2b04c8f1db62..8343244b72c4 100644
--- a/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/trunk/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -614,6 +614,12 @@ int lapic_watchdog_init(unsigned nmi_hz)
 		probe_nmi_watchdog();
 		if (!wd_ops)
 			return -1;
+
+		if (!wd_ops->reserve()) {
+			printk(KERN_ERR
+				"NMI watchdog: cannot reserve perfctrs\n");
+			return -1;
+		}
 	}
 
 	if (!(wd_ops->setup(nmi_hz))) {