---

yaml --- r: 57832 b: refs/heads/master c: faa4cfa h: refs/heads/master v: v3
git-mirror · Jun 16, 2007 · 9b37e63 · 9b37e63
1 parent 44d8a3b
commit 9b37e63
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git 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
@@ -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))) {