bk://linux-dj.bkbits.net/cpufreq
davej@redhat.com|ChangeSet|20040602202135|37158 davej

# This is a BitKeeper generated diff -Nru style patch.
#
# ChangeSet
#   2004/06/02 21:21:35+01:00 davej@redhat.com 
#   [CPUFREQ] Consolidate version checking in longhaul_get_cpu_mult
#   reduce code duplication.
# 
# arch/i386/kernel/cpu/cpufreq/longhaul.c
#   2004/06/02 21:21:25+01:00 davej@redhat.com +1 -5
#   [CPUFREQ] Consolidate version checking in longhaul_get_cpu_mult
#   reduce code duplication.
# 
diff -Nru a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c	2004-06-02 23:38:13 -07:00
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c	2004-06-02 23:38:13 -07:00
@@ -79,11 +79,7 @@
 
 	rdmsr (MSR_IA32_EBL_CR_POWERON, lo, hi);
 	invalue = (lo & (1<<22|1<<23|1<<24|1<<25)) >>22;
-	if (longhaul_version==2) {
-		if (lo & (1<<27))
-			invalue+=16;
-	}
-	if (longhaul_version==4) {
+	if (longhaul_version==2 || longhaul_version==4) {
 		if (lo & (1<<27))
 			invalue+=16;
 	}