Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=caede347c3578b9dca49f53eab781fcaaacd3234
Commit:     caede347c3578b9dca49f53eab781fcaaacd3234
Parent:     d7a1944e8da5e91859b98259189aaaa4d8b7fa07
Author:     [EMAIL PROTECTED] <[EMAIL PROTECTED]>
AuthorDate: Wed Nov 8 01:09:25 2006 -0800
Committer:  Dave Jones <[EMAIL PROTECTED]>
CommitDate: Wed Nov 8 17:14:31 2006 -0500

    [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 <[EMAIL PROTECTED]>
    Signed-off-by: Dave Jones <[EMAIL PROTECTED]>
---
 arch/i386/kernel/cpu/cpufreq/speedstep-lib.c |    5 ++++-
 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 6623a56..a709f6d 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:
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to