diff options
Diffstat (limited to 'arch/x86/kernel/cpu/cpufreq/speedstep-lib.c')
-rw-r--r-- | arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c index f4c290b8482f..a94ec6be69fa 100644 --- a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c +++ b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c | |||
@@ -13,7 +13,6 @@ | |||
13 | #include <linux/moduleparam.h> | 13 | #include <linux/moduleparam.h> |
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/cpufreq.h> | 15 | #include <linux/cpufreq.h> |
16 | #include <linux/slab.h> | ||
17 | 16 | ||
18 | #include <asm/msr.h> | 17 | #include <asm/msr.h> |
19 | #include <asm/tsc.h> | 18 | #include <asm/tsc.h> |
@@ -34,7 +33,7 @@ static int relaxed_check; | |||
34 | * GET PROCESSOR CORE SPEED IN KHZ * | 33 | * GET PROCESSOR CORE SPEED IN KHZ * |
35 | *********************************************************************/ | 34 | *********************************************************************/ |
36 | 35 | ||
37 | static unsigned int pentium3_get_frequency(unsigned int processor) | 36 | static unsigned int pentium3_get_frequency(enum speedstep_processor processor) |
38 | { | 37 | { |
39 | /* See table 14 of p3_ds.pdf and table 22 of 29834003.pdf */ | 38 | /* See table 14 of p3_ds.pdf and table 22 of 29834003.pdf */ |
40 | struct { | 39 | struct { |
@@ -227,7 +226,7 @@ static unsigned int pentium4_get_frequency(void) | |||
227 | 226 | ||
228 | 227 | ||
229 | /* Warning: may get called from smp_call_function_single. */ | 228 | /* Warning: may get called from smp_call_function_single. */ |
230 | unsigned int speedstep_get_frequency(unsigned int processor) | 229 | unsigned int speedstep_get_frequency(enum speedstep_processor processor) |
231 | { | 230 | { |
232 | switch (processor) { | 231 | switch (processor) { |
233 | case SPEEDSTEP_CPU_PCORE: | 232 | case SPEEDSTEP_CPU_PCORE: |
@@ -380,7 +379,7 @@ EXPORT_SYMBOL_GPL(speedstep_detect_processor); | |||
380 | * DETECT SPEEDSTEP SPEEDS * | 379 | * DETECT SPEEDSTEP SPEEDS * |
381 | *********************************************************************/ | 380 | *********************************************************************/ |
382 | 381 | ||
383 | unsigned int speedstep_get_freqs(unsigned int processor, | 382 | unsigned int speedstep_get_freqs(enum speedstep_processor processor, |
384 | unsigned int *low_speed, | 383 | unsigned int *low_speed, |
385 | unsigned int *high_speed, | 384 | unsigned int *high_speed, |
386 | unsigned int *transition_latency, | 385 | unsigned int *transition_latency, |