aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorakpm@osdl.org <akpm@osdl.org>2006-11-08 04:09:25 -0500
committerDave Jones <davej@redhat.com>2006-11-08 17:14:31 -0500
commitcaede347c3578b9dca49f53eab781fcaaacd3234 (patch)
tree60b85806c705a680e34f6fb9832213635d6b0336
parentd7a1944e8da5e91859b98259189aaaa4d8b7fa07 (diff)
[CPUFREQ] Fix build failure on x86-64
arch/x86_64/kernel/cpufreq/../../../i386/kernel/cpu/cpufreq/speedstep-lib.c:131: error: 'MSR_FSB_FREQ' undeclared (first use in this function) Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Dave Jones <davej@redhat.com>
-rw-r--r--arch/i386/kernel/cpu/cpufreq/speedstep-lib.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
index 6623a564f6fd..a709f6d67e25 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
@@ -123,6 +123,7 @@ static unsigned int pentiumM_get_frequency(void)
123 return (msr_tmp * 100 * 1000); 123 return (msr_tmp * 100 * 1000);
124} 124}
125 125
126#ifdef CONFIG_X86_32
126static unsigned int pentium_core_get_frequency(void) 127static unsigned int pentium_core_get_frequency(void)
127{ 128{
128 u32 fsb = 0; 129 u32 fsb = 0;
@@ -152,7 +153,7 @@ static unsigned int pentium_core_get_frequency(void)
152 153
153 return (msr_tmp * fsb * 1000); 154 return (msr_tmp * fsb * 1000);
154} 155}
155 156#endif
156 157
157static unsigned int pentium4_get_frequency(void) 158static unsigned int pentium4_get_frequency(void)
158{ 159{
@@ -204,8 +205,10 @@ static unsigned int pentium4_get_frequency(void)
204unsigned int speedstep_get_processor_frequency(unsigned int processor) 205unsigned int speedstep_get_processor_frequency(unsigned int processor)
205{ 206{
206 switch (processor) { 207 switch (processor) {
208#ifdef CONFIG_X86_32
207 case SPEEDSTEP_PROCESSOR_PCORE: 209 case SPEEDSTEP_PROCESSOR_PCORE:
208 return pentium_core_get_frequency(); 210 return pentium_core_get_frequency();
211#endif
209 case SPEEDSTEP_PROCESSOR_PM: 212 case SPEEDSTEP_PROCESSOR_PM:
210 return pentiumM_get_frequency(); 213 return pentiumM_get_frequency();
211 case SPEEDSTEP_PROCESSOR_P4D: 214 case SPEEDSTEP_PROCESSOR_P4D: