aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjörn Steinbrink <B.Steinbrink@gmx.de>2007-06-16 13:15:56 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-06-16 16:16:15 -0400
commit54c6ed7562d59ab238df1ec9ff76d81d7d0f0842 (patch)
treeba775434be453148ff2d0625359716c2fa5354fa
parentfaa4cfa6b334fc07c3386e620a2fb55de508c077 (diff)
i386: use the right wrapper to disable the NMI watchdog
When disabled through /proc/sys/kernel/nmi_watchdog, the NMI watchdog uses the stop() method directly, which does not decrement the activity counter, leading to a BUG(). Use the wrapper function instead to fix that. Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/i386/kernel/cpu/perfctr-watchdog.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c
index 8343244b72c4..98488f997da6 100644
--- a/arch/i386/kernel/cpu/perfctr-watchdog.c
+++ b/arch/i386/kernel/cpu/perfctr-watchdog.c
@@ -28,7 +28,7 @@ struct wd_ops {
28 void (*unreserve)(void); 28 void (*unreserve)(void);
29 int (*setup)(unsigned nmi_hz); 29 int (*setup)(unsigned nmi_hz);
30 void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz); 30 void (*rearm)(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz);
31 void (*stop)(void *); 31 void (*stop)(void);
32 unsigned perfctr; 32 unsigned perfctr;
33 unsigned evntsel; 33 unsigned evntsel;
34 u64 checkbit; 34 u64 checkbit;
@@ -142,7 +142,7 @@ void disable_lapic_nmi_watchdog(void)
142 if (atomic_read(&nmi_active) <= 0) 142 if (atomic_read(&nmi_active) <= 0)
143 return; 143 return;
144 144
145 on_each_cpu(wd_ops->stop, NULL, 0, 1); 145 on_each_cpu(stop_apic_nmi_watchdog, NULL, 0, 1);
146 wd_ops->unreserve(); 146 wd_ops->unreserve();
147 147
148 BUG_ON(atomic_read(&nmi_active) != 0); 148 BUG_ON(atomic_read(&nmi_active) != 0);
@@ -255,7 +255,7 @@ static int setup_k7_watchdog(unsigned nmi_hz)
255 return 1; 255 return 1;
256} 256}
257 257
258static void single_msr_stop_watchdog(void *arg) 258static void single_msr_stop_watchdog(void)
259{ 259{
260 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); 260 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
261 261
@@ -442,7 +442,7 @@ static int setup_p4_watchdog(unsigned nmi_hz)
442 return 1; 442 return 1;
443} 443}
444 444
445static void stop_p4_watchdog(void *arg) 445static void stop_p4_watchdog(void)
446{ 446{
447 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk); 447 struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
448 wrmsr(wd->cccr_msr, 0, 0); 448 wrmsr(wd->cccr_msr, 0, 0);
@@ -634,7 +634,7 @@ int lapic_watchdog_init(unsigned nmi_hz)
634void lapic_watchdog_stop(void) 634void lapic_watchdog_stop(void)
635{ 635{
636 if (wd_ops) 636 if (wd_ops)
637 wd_ops->stop(NULL); 637 wd_ops->stop();
638} 638}
639 639
640unsigned lapic_adjust_nmi_hz(unsigned hz) 640unsigned lapic_adjust_nmi_hz(unsigned hz)