From 0f05e2b01e7318df9d938fd15ed4576760cce74d Mon Sep 17 00:00:00 2001 From: Jaswinder Singh Rajput Date: Thu, 2 Jul 2009 22:35:35 +0530 Subject: [PATCH] --- yaml --- r: 155043 b: refs/heads/master c: c7210e1ff8a95a0a6dba0d04a95b3ddd9d165fab h: refs/heads/master i: 155041: 267de4f0b1658e5d7671f31b78d368ac3d0e129f 155039: 1d47715a8319938190db5004c407eadd0d0e5c40 v: v3 --- [refs] | 2 +- trunk/arch/x86/include/asm/nmi.h | 1 - trunk/arch/x86/kernel/cpu/perfctr-watchdog.c | 5 ----- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/[refs] b/[refs] index dea99dbb2f09..77dd502453d7 100644 --- 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 index c97264409934..c86e5ed4af51 100644 --- 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 index 5c481f6205bf..e60ed740d2b3 100644 --- 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; -}