---

yaml --- r: 155043 b: refs/heads/master c: c7210e1 h: refs/heads/master i: 155041: 267de4f 155039: 1d47715 v: v3
git-mirror · Jul 3, 2009 · 0f05e2b · 0f05e2b
1 parent abc2e64
commit 0f05e2b
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 23d0cd8e718723f1ddda37637bc6b7c34caec64a
+refs/heads/master: c7210e1ff8a95a0a6dba0d04a95b3ddd9d165fab
diff --git a/trunk/arch/x86/include/asm/nmi.h b/trunk/arch/x86/include/asm/nmi.h
@@ -72,7 +72,6 @@ void lapic_watchdog_stop(void);
 int lapic_watchdog_init(unsigned nmi_hz);
 int lapic_wd_event(unsigned nmi_hz);
 unsigned lapic_adjust_nmi_hz(unsigned hz);
-int lapic_watchdog_ok(void);
 void disable_lapic_nmi_watchdog(void);
 void enable_lapic_nmi_watchdog(void);
 void stop_nmi(void);

diff --git a/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c b/trunk/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -803,8 +803,3 @@ int __kprobes lapic_wd_event(unsigned nmi_hz)
 	wd_ops->rearm(wd, nmi_hz);
 	return 1;
 }
-
-int lapic_watchdog_ok(void)
-{
-	return wd_ops != NULL;
-}