Messages in this thread | | | Date | Thu, 7 Jun 2007 23:41:53 -0700 | From | Andrew Morton <> | Subject | Re: [PATCH] Fix interchanged parameters to release_{evntsel,perfctr}_nmi |
| |
On Fri, 8 Jun 2007 08:02:44 +0200 Björn Steinbrink <B.Steinbrink@gmx.de> wrote:
> Fix interchanged parameters to release_{evntsel,perfctr}_nmi. > > Signed-off-by: Björn Steinbrink <B.Steinbrink@gmx.de> > --- > diff --git a/arch/i386/kernel/cpu/perfctr-watchdog.c b/arch/i386/kernel/cpu/perfctr-watchdog.c > index 2b04c8f..e490ac2 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) > > static void single_msr_unreserve(void) > { > - release_evntsel_nmi(wd_ops->perfctr); > - release_perfctr_nmi(wd_ops->evntsel); > + release_evntsel_nmi(wd_ops->evntsel); > + release_perfctr_nmi(wd_ops->perfctr); > } > > static void single_msr_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz) > @@ -475,10 +475,10 @@ static void p4_unreserve(void) > { > #ifdef CONFIG_SMP > if (smp_num_siblings > 1) > - release_evntsel_nmi(MSR_P4_IQ_PERFCTR1); > + release_perfctr_nmi(MSR_P4_IQ_PERFCTR1); > #endif > - release_evntsel_nmi(MSR_P4_IQ_PERFCTR0); > - release_perfctr_nmi(MSR_P4_CRU_ESCR0); > + release_evntsel_nmi(MSR_P4_CRU_ESCR0); > + release_perfctr_nmi(MSR_P4_IQ_PERFCTR0); > } > > static void p4_rearm(struct nmi_watchdog_ctlblk *wd, unsigned nmi_hz)
Half of this (the first hunk) has been in Andi's tree for a day or two.
I shall drop Andi's patch, queue this one up and shall send this off to Linus if nothing else happens in the next couple of days. - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |