diff options
author | Andi Kleen <ak@suse.de> | 2006-04-07 13:49:48 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-04-09 14:53:51 -0400 |
commit | d7fa706ce2c29cb751c15ca00f3aa7b223e3c9f0 (patch) | |
tree | 0e19431741ca192c8c98d6f06edc56e0d4be08db | |
parent | 95d769aaf47abfc77b600631403ff5af6c990cff (diff) |
[PATCH] x86_64: Revert earlier powernow-k8 change
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
-rw-r--r-- | arch/i386/kernel/cpu/cpufreq/powernow-k8.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c index 712a26bd4457..6ba497c47df6 100644 --- a/arch/i386/kernel/cpu/cpufreq/powernow-k8.c +++ b/arch/i386/kernel/cpu/cpufreq/powernow-k8.c | |||
@@ -55,7 +55,7 @@ static DEFINE_MUTEX(fidvid_mutex); | |||
55 | static struct powernow_k8_data *powernow_data[NR_CPUS]; | 55 | static struct powernow_k8_data *powernow_data[NR_CPUS]; |
56 | 56 | ||
57 | #ifndef CONFIG_SMP | 57 | #ifndef CONFIG_SMP |
58 | static cpumask_t cpu_core_map[1] = { CPU_MASK_ALL }; | 58 | static cpumask_t cpu_core_map[1]; |
59 | #endif | 59 | #endif |
60 | 60 | ||
61 | /* Return a frequency in MHz, given an input fid */ | 61 | /* Return a frequency in MHz, given an input fid */ |
@@ -977,7 +977,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
977 | { | 977 | { |
978 | struct powernow_k8_data *data; | 978 | struct powernow_k8_data *data; |
979 | cpumask_t oldmask = CPU_MASK_ALL; | 979 | cpumask_t oldmask = CPU_MASK_ALL; |
980 | int rc, i; | 980 | int rc; |
981 | 981 | ||
982 | if (!cpu_online(pol->cpu)) | 982 | if (!cpu_online(pol->cpu)) |
983 | return -ENODEV; | 983 | return -ENODEV; |
@@ -1063,8 +1063,7 @@ static int __cpuinit powernowk8_cpu_init(struct cpufreq_policy *pol) | |||
1063 | printk("cpu_init done, current fid 0x%x, vid 0x%x\n", | 1063 | printk("cpu_init done, current fid 0x%x, vid 0x%x\n", |
1064 | data->currfid, data->currvid); | 1064 | data->currfid, data->currvid); |
1065 | 1065 | ||
1066 | for_each_cpu_mask(i, cpu_core_map[pol->cpu]) | 1066 | powernow_data[pol->cpu] = data; |
1067 | powernow_data[i] = data; | ||
1068 | 1067 | ||
1069 | return 0; | 1068 | return 0; |
1070 | 1069 | ||