diff options
| -rw-r--r-- | arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c index bec50170b75a..4786fedca6eb 100644 --- a/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c +++ b/arch/i386/kernel/cpu/cpufreq/p4-clockmod.c | |||
| @@ -51,7 +51,6 @@ enum { | |||
| 51 | 51 | ||
| 52 | 52 | ||
| 53 | static int has_N44_O17_errata[NR_CPUS]; | 53 | static int has_N44_O17_errata[NR_CPUS]; |
| 54 | static int has_N60_errata[NR_CPUS]; | ||
| 55 | static unsigned int stock_freq; | 54 | static unsigned int stock_freq; |
| 56 | static struct cpufreq_driver p4clockmod_driver; | 55 | static struct cpufreq_driver p4clockmod_driver; |
| 57 | static unsigned int cpufreq_p4_get(unsigned int cpu); | 56 | static unsigned int cpufreq_p4_get(unsigned int cpu); |
| @@ -224,12 +223,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) | |||
| 224 | case 0x0f12: | 223 | case 0x0f12: |
| 225 | has_N44_O17_errata[policy->cpu] = 1; | 224 | has_N44_O17_errata[policy->cpu] = 1; |
| 226 | dprintk("has errata -- disabling low frequencies\n"); | 225 | dprintk("has errata -- disabling low frequencies\n"); |
| 227 | break; | ||
| 228 | |||
| 229 | case 0x0f29: | ||
| 230 | has_N60_errata[policy->cpu] = 1; | ||
| 231 | dprintk("has errata -- disabling frequencies lower than 2ghz\n"); | ||
| 232 | break; | ||
| 233 | } | 226 | } |
| 234 | 227 | ||
| 235 | /* get max frequency */ | 228 | /* get max frequency */ |
| @@ -241,8 +234,6 @@ static int cpufreq_p4_cpu_init(struct cpufreq_policy *policy) | |||
| 241 | for (i=1; (p4clockmod_table[i].frequency != CPUFREQ_TABLE_END); i++) { | 234 | for (i=1; (p4clockmod_table[i].frequency != CPUFREQ_TABLE_END); i++) { |
| 242 | if ((i<2) && (has_N44_O17_errata[policy->cpu])) | 235 | if ((i<2) && (has_N44_O17_errata[policy->cpu])) |
| 243 | p4clockmod_table[i].frequency = CPUFREQ_ENTRY_INVALID; | 236 | p4clockmod_table[i].frequency = CPUFREQ_ENTRY_INVALID; |
| 244 | else if (has_N60_errata[policy->cpu] && ((stock_freq * i)/8) < 2000000) | ||
| 245 | p4clockmod_table[i].frequency = CPUFREQ_ENTRY_INVALID; | ||
| 246 | else | 237 | else |
| 247 | p4clockmod_table[i].frequency = (stock_freq * i)/8; | 238 | p4clockmod_table[i].frequency = (stock_freq * i)/8; |
| 248 | } | 239 | } |
