diff for duplicates of <20090413102749.4ca3a217.akpm@linux-foundation.org> diff --git a/a/1.txt b/N1/1.txt index 0513d71..df59db8 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -141,3 +141,18 @@ diff -puN arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c~arch-x86-kernel-cpu-cpufreq rdmsr(MSR_IA32_APERF, cur->aperf.split.lo, cur->aperf.split.hi); rdmsr(MSR_IA32_MPERF, cur->mperf.split.lo, cur->mperf.split.hi); +- +- return 0; + } + + /* +@@ -283,7 +280,7 @@ static unsigned int get_measured_perf(st + unsigned int perf_percent; + unsigned int retval; + +- if (!work_on_cpu(cpu, read_measured_perf_ctrs, &readin)) ++ if (smp_call_function_single(cpu, read_measured_perf_ctrs, &cur, 1)) + return 0; + + cur.aperf.whole = readin.aperf.whole - +_ diff --git a/a/content_digest b/N1/content_digest index 2198fcd..09603d3 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -158,6 +158,21 @@ " \tstruct perf_pair *cur = _cur;\n" " \n" " \trdmsr(MSR_IA32_APERF, cur->aperf.split.lo, cur->aperf.split.hi);\n" - " \trdmsr(MSR_IA32_MPERF, cur->mperf.split.lo, cur->mperf.split.hi);" + " \trdmsr(MSR_IA32_MPERF, cur->mperf.split.lo, cur->mperf.split.hi);\n" + "-\n" + "-\treturn 0;\n" + " }\n" + " \n" + " /*\n" + "@@ -283,7 +280,7 @@ static unsigned int get_measured_perf(st\n" + " \tunsigned int perf_percent;\n" + " \tunsigned int retval;\n" + " \n" + "-\tif (!work_on_cpu(cpu, read_measured_perf_ctrs, &readin))\n" + "+\tif (smp_call_function_single(cpu, read_measured_perf_ctrs, &cur, 1))\n" + " \t\treturn 0;\n" + " \n" + " \tcur.aperf.whole = readin.aperf.whole -\n" + _ -a15a16f111b7bbf8d6cfb71120256a21da99d714acc21154ac478f5eba9827dc +3ddf7542d87d8ee66fb5323fe7709afa188a46cbe7c82bed7d74069c6ca32ac2
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.