* [PATCH] x86: resolve hidden patch conflict in arch/x86/kernel/cpu/perfctr-watchdog.c
@ 2007-12-10 15:46 Jan Beulich
0 siblings, 0 replies; only message in thread
From: Jan Beulich @ 2007-12-10 15:46 UTC (permalink / raw)
To: mingo; +Cc: eranian, linux-kernel
There apparently was an unnoticed conflict between an earlier patch to
this file and mine (d1e084746b0e5806e6345ab31c5b370f8dee2b23), which
I noticed only now. I suppose a change like the one below (untested) is
needed; I didn't get any response on a confirmation request for this from
the submitter of the first patch.
The issue is the writing of the 'checkbit' member at the end of
setup_intel_arch_watchdog(), which my patch made go to intel_arch_wd_ops
rather than wd_ops.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Cc: Stephane Eranian <eranian@hpl.hp.com>
arch/x86/kernel/cpu/perfctr-watchdog.c | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
--- linux-2.6.24-rc4/arch/x86/kernel/cpu/perfctr-watchdog.c 2007-12-10 16:11:18.000000000 +0100
+++ 2.6.24-rc4-x86-coreduo-wd-ops/arch/x86/kernel/cpu/perfctr-watchdog.c 2007-12-06 08:51:03.000000000 +0100
@@ -615,16 +615,6 @@ static struct wd_ops intel_arch_wd_ops _
.evntsel = MSR_ARCH_PERFMON_EVENTSEL1,
};
-static struct wd_ops coreduo_wd_ops = {
- .reserve = single_msr_reserve,
- .unreserve = single_msr_unreserve,
- .setup = setup_intel_arch_watchdog,
- .rearm = p6_rearm,
- .stop = single_msr_stop_watchdog,
- .perfctr = MSR_ARCH_PERFMON_PERFCTR0,
- .evntsel = MSR_ARCH_PERFMON_EVENTSEL0,
-};
-
static void probe_nmi_watchdog(void)
{
switch (boot_cpu_data.x86_vendor) {
@@ -638,8 +628,8 @@ static void probe_nmi_watchdog(void)
/* Work around Core Duo (Yonah) errata AE49 where perfctr1
doesn't have a working enable bit. */
if (boot_cpu_data.x86 == 6 && boot_cpu_data.x86_model == 14) {
- wd_ops = &coreduo_wd_ops;
- break;
+ intel_arch_wd_ops.perfctr = MSR_ARCH_PERFMON_PERFCTR0;
+ intel_arch_wd_ops.evntsel = MSR_ARCH_PERFMON_EVENTSEL0;
}
if (cpu_has(&boot_cpu_data, X86_FEATURE_ARCH_PERFMON)) {
wd_ops = &intel_arch_wd_ops;
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2007-12-10 15:46 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-12-10 15:46 [PATCH] x86: resolve hidden patch conflict in arch/x86/kernel/cpu/perfctr-watchdog.c Jan Beulich
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).