[PATCH] ACPI :Restore the previous calculation of FSB ratio for mode <2

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Subject: ACPI :Restore the previous calculation of FSB ratio for mode <2
>From : Zhao Yakui <yakui.zhao@xxxxxxxxx>

The ratio is undefined in the register of MSR_FBC_REGSITER_ID
when the model for P4 is less than 2. So the following calculation in
comment (3e4159ab35c88aef5e063ba78796b277b762a30a) is inappropriate.
   if (c->x86_model < 2)
         mult = msr_lo >> 27;

It is more appropriate that the commit is reverted 
until the proper patch in that place has been developed.

http://bugzilla.kernel.org/show_bug.cgi?id=7186

Signed-off-by: Zhao Yakui <yakui.zhao@xxxxxxxxx>
---
 arch/x86/kernel/cpu/cpufreq/speedstep-lib.c |    5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

Index: linux-2.6.24-rc1/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
===================================================================
--- linux-2.6.24-rc1.orig/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
+++ linux-2.6.24-rc1/arch/x86/kernel/cpu/cpufreq/speedstep-lib.c
@@ -189,10 +189,7 @@ static unsigned int pentium4_get_frequen
 		printk(KERN_DEBUG "speedstep-lib: couldn't detect FSB speed. Please send an e-mail to <linux@xxxxxxxx>\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 linux-acpi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux IBM ACPI]     [Linux Power Management]     [Linux Kernel]     [Linux Laptop]     [Kernel Newbies]     [Share Photos]     [Security]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Samba]     [Video 4 Linux]     [Device Mapper]     [Linux Resources]

  Powered by Linux