Merge branch 'x86/urgent' into x86/pat

[firefly-linux-kernel-4.4.55.git] / arch / x86 / kernel / cpu / perfctr-watchdog.c

diff --git a/arch/x86/kernel/cpu/perfctr-watchdog.c b/arch/x86/kernel/cpu/perfctr-watchdog.c
index 8100a29c854ff5d65a0ebb0817fbc084422af87b..392bea43b890ba63746640e0bad2a77b2b775427 100644 (file)
--- a/arch/x86/kernel/cpu/perfctr-watchdog.c
+++ b/arch/x86/kernel/cpu/perfctr-watchdog.c
@@ -804,8 +804,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;
-}