The patch titled
x86_64: make NMI use PERFCTR1 for architectural perfmon (take 2)
has been removed from the -mm tree. Its filename was
x86_64-make-nmi-use-perfctr1-for-architectural-perfmon-take-2.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: x86_64: make NMI use PERFCTR1 for architectural perfmon (take 2)
From: Stephane Eranian <eranian@xxxxxxxxxx>
Make the NMI watchdog use PERFSEL1/PERFCTR1 instead of PERFSEL0/PERFCTR0 on
processors supporting Intel architectural perfmon, such as Intel Core 2.
Although all PMU events can work on both counters, the Precise Event-Based
Sampling (PEBS) requires that the event be in PERFCTR0 to work correctly
(see section 18.14.4.1 in the IA32 SDM Vol 3b). This versions has 3 chunks
compared to previous where we had missed on check.
Signed-off-by: stephane eranian <eranian@xxxxxxxxxx>
Cc: Andi Kleen <ak@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/x86_64/kernel/nmi.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff -puN arch/x86_64/kernel/nmi.c~x86_64-make-nmi-use-perfctr1-for-architectural-perfmon-take-2 arch/x86_64/kernel/nmi.c
--- a/arch/x86_64/kernel/nmi.c~x86_64-make-nmi-use-perfctr1-for-architectural-perfmon-take-2
+++ a/arch/x86_64/kernel/nmi.c
@@ -285,7 +285,7 @@ int __init check_nmi_watchdog (void)
struct nmi_watchdog_ctlblk *wd = &__get_cpu_var(nmi_watchdog_ctlblk);
nmi_hz = 1;
- if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0)
+ if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR1)
nmi_hz = adjust_for_32bit_ctr(nmi_hz);
}
@@ -650,8 +650,8 @@ static int setup_intel_arch_watchdog(voi
(ebx & ARCH_PERFMON_UNHALTED_CORE_CYCLES_PRESENT))
goto fail;
- perfctr_msr = MSR_ARCH_PERFMON_PERFCTR0;
- evntsel_msr = MSR_ARCH_PERFMON_EVENTSEL0;
+ perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1;
+ evntsel_msr = MSR_ARCH_PERFMON_EVENTSEL1;
if (!reserve_perfctr_nmi(perfctr_msr))
goto fail;
@@ -895,7 +895,7 @@ int __kprobes nmi_watchdog_tick(struct p
/* start the cycle over again */
wrmsrl(wd->perfctr_msr,
-((u64)cpu_khz * 1000 / nmi_hz));
- } else if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0) {
+ } else if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR1) {
/*
* ArchPerfom/Core Duo needs to re-unmask
* the apic vector
_
Patches currently in -mm which might be from eranian@xxxxxxxxxx are
git-ia64.patch
ia64-permon-use-after-free-fix.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
