Merge master.kernel.org:/pub/scm/linux/kernel/git/herbert/crypto-2.6

[linux-drm-fsl-dcu.git] / arch / i386 / kernel / cpu / cpufreq / speedstep-lib.c

diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
index 6623a564f6fdcea6543cf7248bf97170fbb1ec7b..b1acc8ce3167c8f02d0747f7282fc8b685e1d94a 100644 (file)
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-lib.c
@@ -13,7 +13,6 @@
 #include <linux/moduleparam.h>
 #include <linux/init.h>
 #include <linux/cpufreq.h>
-#include <linux/pci.h>
 #include <linux/slab.h>
 
 #include <asm/msr.h>
@@ -129,16 +128,16 @@ static unsigned int pentium_core_get_frequency(void)
        u32 msr_lo, msr_tmp;
 
        rdmsr(MSR_FSB_FREQ, msr_lo, msr_tmp);
-       /* see table B-2 of 24547212.pdf */
+       /* see table B-2 of 25366920.pdf */
        switch (msr_lo & 0x07) {
        case 5:
-               fsb = 400;
+               fsb = 100000;
                break;
        case 1:
-               fsb = 533;
+               fsb = 133333;
                break;
        case 3:
-               fsb = 667;
+               fsb = 166667;
                break;
        default:
                printk(KERN_ERR "PCORE - MSR_FSB_FREQ undefined value");
@@ -148,9 +147,9 @@ static unsigned int pentium_core_get_frequency(void)
        dprintk("PCORE - MSR_IA32_EBL_CR_POWERON: 0x%x 0x%x\n", msr_lo, msr_tmp);
 
        msr_tmp = (msr_lo >> 22) & 0x1f;
-       dprintk("bits 22-26 are 0x%x, speed is %u\n", msr_tmp, (msr_tmp * fsb * 1000));
+       dprintk("bits 22-26 are 0x%x, speed is %u\n", msr_tmp, (msr_tmp * fsb));
 
-       return (msr_tmp * fsb * 1000);
+       return (msr_tmp * fsb);
 }