Commit caede347 authored by akpm@osdl.org's avatar akpm@osdl.org Committed by Dave Jones

[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: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarDave Jones <davej@redhat.com>
parent d7a1944e
...@@ -123,6 +123,7 @@ static unsigned int pentiumM_get_frequency(void) ...@@ -123,6 +123,7 @@ static unsigned int pentiumM_get_frequency(void)
return (msr_tmp * 100 * 1000); return (msr_tmp * 100 * 1000);
} }
#ifdef CONFIG_X86_32
static unsigned int pentium_core_get_frequency(void) static unsigned int pentium_core_get_frequency(void)
{ {
u32 fsb = 0; u32 fsb = 0;
...@@ -152,7 +153,7 @@ static unsigned int pentium_core_get_frequency(void) ...@@ -152,7 +153,7 @@ static unsigned int pentium_core_get_frequency(void)
return (msr_tmp * fsb * 1000); return (msr_tmp * fsb * 1000);
} }
#endif
static unsigned int pentium4_get_frequency(void) static unsigned int pentium4_get_frequency(void)
{ {
...@@ -204,8 +205,10 @@ static unsigned int pentium4_get_frequency(void) ...@@ -204,8 +205,10 @@ static unsigned int pentium4_get_frequency(void)
unsigned int speedstep_get_processor_frequency(unsigned int processor) unsigned int speedstep_get_processor_frequency(unsigned int processor)
{ {
switch (processor) { switch (processor) {
#ifdef CONFIG_X86_32
case SPEEDSTEP_PROCESSOR_PCORE: case SPEEDSTEP_PROCESSOR_PCORE:
return pentium_core_get_frequency(); return pentium_core_get_frequency();
#endif
case SPEEDSTEP_PROCESSOR_PM: case SPEEDSTEP_PROCESSOR_PM:
return pentiumM_get_frequency(); return pentiumM_get_frequency();
case SPEEDSTEP_PROCESSOR_P4D: case SPEEDSTEP_PROCESSOR_P4D:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment