Hi Rusty,
Today's linux-next merge of the rr tree got a conflict in
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c between various commits from
Linus' tree and commit cf2fb1659cb6d1269487f3c9870f045b95e5e3a2 ("use
smp_call_function_single() in
arch/x86/kernel/cpu/cpufreq/acpi-cpufreq.c") from the rr tree.
I used the version from Linus' tree. The only doubt in my mind is that
the test of the return from smp_call_function_single in
get_measured_perf is inverted between the two trees. i.e.
if (smp_...
vs
if (!smp_...
--
Cheers,
Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/
Attachment:
pgpjL8OVFlGqs.pgp
Description: PGP signature
