diff for duplicates of <20070215090045.GA12544@frankl.hpl.hp.com>
diff --git a/a/1.txt b/N1/1.txt
index 3b58bf1..0f3dfd5 100644
--- a/a/1.txt
+++ b/N1/1.txt
@@ -55,8 +55,8 @@ diff --exclude=.git -urp linux-2.6.20.base/arch/x86_64/kernel/nmi.c linux-2.6.20
* 32nd bit should be 1, for 33.. to be 1.
* Find the appropriate nmi_hz
*/
-- if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0 &&
-+ if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR1 &&
+- if (wd->perfctr_msr = MSR_ARCH_PERFMON_PERFCTR0 &&
++ if (wd->perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1 &&
((u64)cpu_khz * 1000) > 0x7fffffffULL) {
nmi_hz = ((u64)cpu_khz * 1000) / 0x7fffffffUL + 1;
}
@@ -75,8 +75,8 @@ diff --exclude=.git -urp linux-2.6.20.base/arch/x86_64/kernel/nmi.c linux-2.6.20
dummy &= ~P4_CCCR_OVF;
wrmsrl(wd->cccr_msr, dummy);
apic_write(APIC_LVTPC, APIC_DM_NMI);
-- } else if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0) {
-+ } else if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR1) {
+- } 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
\ No newline at end of file
diff --git a/a/content_digest b/N1/content_digest
index 4287702..10251dd 100644
--- a/a/content_digest
+++ b/N1/content_digest
@@ -14,7 +14,7 @@
"Subject\0Re: 2.6.20 new perfmon code base + libpfm + pfmon\0"
]
[
- "Date\0Thu, 15 Feb 2007 01:00:45 -0800\0"
+ "Date\0Thu, 15 Feb 2007 09:00:45 +0000\0"
]
[
"To\0Andi Kleen <andi\@firstfloor.org>\0"
@@ -91,8 +91,8 @@
" \t\t * 32nd bit should be 1, for 33.. to be 1.\n",
" \t\t * Find the appropriate nmi_hz\n",
" \t\t */\n",
- "-\t \tif (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0 &&\n",
- "+\t \tif (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR1 &&\n",
+ "-\t \tif (wd->perfctr_msr = MSR_ARCH_PERFMON_PERFCTR0 &&\n",
+ "+\t \tif (wd->perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1 &&\n",
" \t\t\t((u64)cpu_khz * 1000) > 0x7fffffffULL) {\n",
" \t\t\tnmi_hz = ((u64)cpu_khz * 1000) / 0x7fffffffUL + 1;\n",
" \t\t}\n",
@@ -111,11 +111,11 @@
" \t\t\t\tdummy &= ~P4_CCCR_OVF;\n",
" \t \t\t\twrmsrl(wd->cccr_msr, dummy);\n",
" \t \t\t\tapic_write(APIC_LVTPC, APIC_DM_NMI);\n",
- "-\t \t\t} else if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR0) {\n",
- "+\t \t\t} else if (wd->perfctr_msr == MSR_ARCH_PERFMON_PERFCTR1) {\n",
+ "-\t \t\t} else if (wd->perfctr_msr = MSR_ARCH_PERFMON_PERFCTR0) {\n",
+ "+\t \t\t} else if (wd->perfctr_msr = MSR_ARCH_PERFMON_PERFCTR1) {\n",
" \t\t\t\t/*\n",
" \t\t\t\t * ArchPerfom/Core Duo needs to re-unmask\n",
" \t\t\t\t * the apic vector"
]
-7bdd9fb52f9b9fc5df727cbb2108f0b1f32fc47e0e06311705373119a79e2aff
+787e532aaa2b6bc3437b566ac29f73e0d09aba6dbb303a279c85d653bfa77409
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.