Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=ed9cbcd40004904dbe61ccc16d6106a7de38c998
Commit:     ed9cbcd40004904dbe61ccc16d6106a7de38c998
Parent:     2ffbb8377c7a0713baf6644e285adc27a5654582
Author:     Zhao Yakui <[EMAIL PROTECTED]>
AuthorDate: Tue Nov 20 14:20:21 2007 -0500
Committer:  Len Brown <[EMAIL PROTECTED]>
CommitDate: Tue Nov 20 14:20:21 2007 -0500

    Revert "speedstep-lib.c: fix frequency multiplier for Pentium4 models 0&1"
    
    For P4 model < 2, The MSR_FBC_REGISTER_ID ratio is undefined.
    Revert the commit that was added to handle that case,
    as it results in random MHz displayed.  Something else will
    have to be done to properly handle model < 2.
    
    //commit 3e4159ab35c88aef5e063ba78796b277b762a30a
    //Author: matthias.christian <matthias.christian>
    //Date:   Sat Feb 5 23:09:38 2005 +0000
    //
    //    [PATCH] speedstep-lib.c: fix frequency multiplier for Pentium4 models 
0&1
    //
    //    The Pentium4 models 0&1 have a longer MSR_EBC_FREQUENCY_ID register 
as the
    //    models 2&3, so the bit shift must be bigger.
    //
    //    Signed-off-by: Matthias-Christian Ott <[EMAIL PROTECTED]>
    //    Signed-off-by: Dominik Brodowski <[EMAIL PROTECTED]>
    //    Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
    //    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
    //
    //    BKrev: 42055232eWM-NgjhZVir44mp5GXktQ
    
    http://bugzilla.kernel.org/show_bug.cgi?id=7186
    
    Signed-off-by: Zhao Yakui <[EMAIL PROTECTED]>
    Signed-off-by: Len Brown <[EMAIL PROTECTED]>
---
 arch/x86/kernel/cpu/cpufreq/speedstep-lib.c |    5 +----
 1 files changed, 1 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c 
b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
index 76c3ab0..98d4fdb 100644
--- a/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
@@ -189,10 +189,7 @@ static unsigned int pentium4_get_frequency(void)
                printk(KERN_DEBUG "speedstep-lib: couldn't detect FSB speed. 
Please send an e-mail to <[EMAIL PROTECTED]>\n");
 
        /* Multiplier. */
-       if (c->x86_model < 2)
-               mult = msr_lo >> 27;
-       else
-               mult = msr_lo >> 24;
+       mult = msr_lo >> 24;
 
        dprintk("P4 - FSB %u kHz; Multiplier %u; Speed %u kHz\n", fsb, mult, 
(fsb * mult));
 
-
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