rpms/cpuspeed/FC-6 cpuspeed.init,1.17,1.18 cpuspeed.spec,1.44,1.45

[fedora-cvs-commits at redhat.com]

Author: jwilson

Update of /cvs/dist/rpms/cpuspeed/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv6353

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
- Fix error-suppression for systems that report support
  for est, but have it disabled in the bios
- Fix up documentation in config file
- Fall back cleanly to userspace governor on
  non-centrino/powernow-k8/p4-clockmod systems
- Update description to reflect support for
  kernel-space freq scaling



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-6/cpuspeed.init,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- cpuspeed.init	10 Jan 2007 22:16:39 -0000	1.17
+++ cpuspeed.init	12 Jan 2007 15:50:36 -0000	1.18
@@ -100,12 +100,11 @@
 	if [ -n "`pidof cpuspeed`" ]; then
 	    killproc cpuspeed -USR1
 	    killproc cpuspeed -INT
-	    RETVAL=$?
 	fi
 	if [ -n "`pidof cpuspeed`" ]; then
 	    killproc cpuspeed
-	    RETVAL=$?
 	fi
+	RETVAL=$?
 	return $RETVAL
 }
 
@@ -122,11 +121,11 @@
 					grep flags /proc/cpuinfo | \
 						grep -q est ; then
 					# use ACPI as a fallback 
-					/sbin/modprobe acpi-cpufreq 2>&1 > /dev/null
+					/sbin/modprobe acpi-cpufreq 2> /dev/null
 					# if even ACPI didn't work, remove it
 					# and then next test will bail out.
 					[ -d ${cpu0freqd} ] || \
-						/sbin/modprobe -r acpi-cpufreq 2>&1 > /dev/null
+						/sbin/modprobe -r acpi-cpufreq 2> /dev/null
 				else
 					# No scaling. Just exit.
 					return 0
@@ -142,20 +141,21 @@
 
 		case "$drv" in
 		centrino|powernow-k8|p4-clockmod)
-			governor=${GOVERNOR:-ondemand}
+			default_governor=ondemand
 			;;
 		*)
-			governor=${GOVERNOR:-userspace}
+			default_governor=userspace
 			;;
 		esac
+		governor=${GOVERNOR:-${default_governor}}
 		governor_is_module && /sbin/modprobe cpufreq-${governor}
 		if [ `grep -c -w ${governor} ${cpu0freqd}/scaling_available_governors` -ge 1 ] ; then
 		    $logger "Enabling ${governor} cpu frequency scaling governor"
 		else
-		    $logger "Invalid governor \"${governor}\" specified, falling back to ondemand"
-		    /sbin/modprobe -r cpufreq-${governor}
-		    governor="ondemand"
-		    /sbin/modprobe cpufreq-${governor}
+		    $logger "Invalid governor \"${governor}\" specified, falling back to ${default_governor}"
+		    governor_is_module && /sbin/modprobe -r cpufreq-${governor}
+		    governor=${default_governor}
+		    governor_is_module && /sbin/modprobe cpufreq-${governor}
 		fi
 		adjust_cpufreq scaling_governor ${governor}
 		# cpuspeed daemon only runs w/userspace governor


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-6/cpuspeed.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- cpuspeed.spec	10 Jan 2007 22:16:39 -0000	1.44
+++ cpuspeed.spec	12 Jan 2007 15:50:36 -0000	1.45
@@ -30,6 +30,10 @@
 if it is capable (needs Intel Speedstep, AMD PowerNow!,
 or similar support).
 
+This package also supports enabling cpu frequency scaling
+via in-kernel governors on Intel Centrino and AMD
+Athlon64/Opteron platforms.
+
 %prep
 %setup -q
 
@@ -81,6 +85,15 @@
 exit 0
 
 %changelog
+* Thu Jan 11 2007 Jarod Wilson <jwilson at redhat.com>
+- Fix error-suppression for systems that report support
+  for est, but have it disabled in the bios (#220200)
+- Fix up documentation in config file (#219926)
+- Fall back cleanly to userspace governor on
+  non-centrino/powernow-k8/p4-clockmod systems
+- Update description to reflect support for
+  kernel-space freq scaling
+
 * Wed Jan 10 2007 Jarod Wilson <jwilson at redhat.com>
 - Fix governor validation check
 - Use ondemand by default on p4-clockmod systems