From: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
This is required to handle more than 2 siblings per package.
---
arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff -puN arch/i386/kernel/cpu/cpufreq/p4-clockmod.c~p4-clockmod-more-than-two-siblings arch/i386/kernel/cpu/cpufreq/p4-clockmod.c
--- 25/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c~p4-clockmod-more-than-two-siblings 2004-01-24 16:20:43.000000000 -0800
+++ 25-akpm/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c 2004-01-24 16:20:43.000000000 -0800
@@ -57,8 +57,7 @@ static int cpufreq_p4_setdc(unsigned int
u32 l, h;
cpumask_t cpus_allowed, affected_cpu_map;
struct cpufreq_freqs freqs;
- int hyperthreading = 0;
- int sibling = 0;
+ int j;
if (!cpu_online(cpu) || (newstate > DC_DISABLE) ||
(newstate == DC_RESV))
@@ -94,11 +93,11 @@ static int cpufreq_p4_setdc(unsigned int
/* notifiers */
freqs.old = stock_freq * l / 8;
freqs.new = stock_freq * newstate / 8;
- freqs.cpu = cpu;
- cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
- if (hyperthreading) {
- freqs.cpu = sibling;
- cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+ for_each_cpu(j) {
+ if (cpu_isset(j, affected_cpu_map)) {
+ freqs.cpu = j;
+ cpufreq_notify_transition(&freqs, CPUFREQ_PRECHANGE);
+ }
}
rdmsr(MSR_IA32_THERM_STATUS, l, h);
@@ -129,10 +128,11 @@ static int cpufreq_p4_setdc(unsigned int
set_cpus_allowed(current, cpus_allowed);
/* notifiers */
- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
- if (hyperthreading) {
- freqs.cpu = cpu;
- cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+ for_each_cpu(j) {
+ if (cpu_isset(j, affected_cpu_map)) {
+ freqs.cpu = j;
+ cpufreq_notify_transition(&freqs, CPUFREQ_POSTCHANGE);
+ }
}
return 0;
_