[CPUFREQ] Fix build failure on x86-64
authorakpm@osdl.org <akpm@osdl.org>
Wed, 8 Nov 2006 09:09:25 +0000 (01:09 -0800)
committerDave Jones <davej@redhat.com>
Wed, 8 Nov 2006 22:14:31 +0000 (17:14 -0500)
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>
arch/i386/kernel/cpu/cpufreq/speedstep-lib.c

index 6623a564f6fdcea6543cf7248bf97170fbb1ec7b..a709f6d67e25797a97cfd1607d7dfb0f7f368569 100644 (file)
@@ -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: