diff options
-rw-r--r-- | arch/i386/kernel/cpu/perfctr-watchdog.c | 10 |
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 98488f997da6..f0b67630b90d 100644 --- a/arch/i386/kernel/cpu/perfctr-watchdog.c +++ b/arch/i386/kernel/cpu/perfctr-watchdog.c | |||
@@ -276,8 +276,8 @@ static int single_msr_reserve(void) | |||
276 | 276 | ||
277 | static void single_msr_unreserve(void) | 277 | static void single_msr_unreserve(void) |
278 | { | 278 | { |
279 | release_evntsel_nmi(wd_ops->perfctr); | 279 | release_evntsel_nmi(wd_ops->evntsel); |
280 | release_perfctr_nmi(wd_ops->evntsel); | 280 | release_perfctr_nmi(wd_ops->perfctr); |
281 | } | 281 | } |
282 | 282 | ||
283 | static void single_msr_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz) | 283 | static void single_msr_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz) |
@@ -475,10 +475,10 @@ static void p4_unreserve(void) | |||
475 | { | 475 | { |
476 | #ifdef CONFIG_SMP | 476 | #ifdef CONFIG_SMP |
477 | if (smp_num_siblings > 1) | 477 | if (smp_num_siblings > 1) |
478 | release_evntsel_nmi(MSR_P4_IQ_PERFCTR1); | 478 | release_perfctr_nmi(MSR_P4_IQ_PERFCTR1); |
479 | #endif | 479 | #endif |
480 | release_evntsel_nmi(MSR_P4_IQ_PERFCTR0); | 480 | release_evntsel_nmi(MSR_P4_CRU_ESCR0); |
481 | release_perfctr_nmi(MSR_P4_CRU_ESCR0); | 481 | release_perfctr_nmi(MSR_P4_IQ_PERFCTR0); |
482 | } | 482 | } |
483 | 483 | ||
484 | static void p4_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz) | 484 | static void p4_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz) |