From caede347c3578b9dca49f53eab781fcaaacd3234 Mon Sep 17 00:00:00 2001 From: "akpm@osdl.org" Date: Wed, 8 Nov 2006 01:09:25 -0800 Subject: [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 Signed-off-by: Dave Jones --- arch/i386/kernel/cpu/cpufreq/speedstep-lib.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'arch/i386/kernel/cpu/cpufreq') diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c index 6623a564f6f..a709f6d67e2 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) return (msr_tmp * 100 * 1000); } +#ifdef CONFIG_X86_32 static unsigned int pentium_core_get_frequency(void) { u32 fsb = 0; @@ -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) { @@ -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: -- cgit v1.2.3