Skip to content

Commit

Permalink
[CPUFREQ] Fix build failure on x86-64
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
akpm@osdl.org authored and Dave Jones committed Nov 8, 2006
1 parent d7a1944 commit caede34
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ static unsigned int pentiumM_get_frequency(void)
return (msr_tmp * 100 * 1000);
}

#ifdef CONFIG_X86_32
static unsigned int pentium_core_get_frequency(void)
{
u32 fsb = 0;
Expand Down Expand Up @@ -152,7 +153,7 @@ static unsigned int pentium_core_get_frequency(void)

return (msr_tmp * fsb * 1000);
}

#endif

static unsigned int pentium4_get_frequency(void)
{
Expand Down Expand Up @@ -204,8 +205,10 @@ static unsigned int pentium4_get_frequency(void)
unsigned int speedstep_get_processor_frequency(unsigned int processor)
{
switch (processor) {
#ifdef CONFIG_X86_32
case SPEEDSTEP_PROCESSOR_PCORE:
return pentium_core_get_frequency();
#endif
case SPEEDSTEP_PROCESSOR_PM:
return pentiumM_get_frequency();
case SPEEDSTEP_PROCESSOR_P4D:
Expand Down

0 comments on commit caede34

Please sign in to comment.