rpms/cpuspeed/devel cpuspeed.init,1.4,1.5 cpuspeed.spec,1.23,1.24

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Mon Nov 14 2005 Dave Jones <davej at redhat.com>
- Don't try and load acpi-cpufreq if we have no throttling states.



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cpuspeed.init	29 Sep 2005 23:46:47 -0000	1.4
+++ cpuspeed.init	15 Nov 2005 03:42:16 -0000	1.5
@@ -24,8 +24,12 @@
 				/sbin/modprobe "$DRIVER"
 			else
 				# use ACPI as a fallback if its available.
-				if [ -f /proc/acpi/processor/CPU0/info ]; then
-					/sbin/modprobe acpi-cpufreq
+				if [ -f /proc/acpi/processor/CPU0/throttling ]; then
+					# Check we have throttling states available.
+					thr=`head -n1 /proc/acpi/processor/CPU0/throttling`
+					if [ "$thr" != "<not supported>" ]; then
+						/sbin/modprobe acpi-cpufreq
+					fi
 				fi
 			fi
 		fi


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- cpuspeed.spec	29 Sep 2005 23:46:47 -0000	1.23
+++ cpuspeed.spec	15 Nov 2005 03:42:16 -0000	1.24
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Mon Nov 14 2005 Dave Jones <davej at redhat.com>
+- Don't try and load acpi-cpufreq if we have no throttling states.
+
 * Thu Sep 29 2005 Dave Jones <davej at redhat.com>
 - On shutdown, restore speed to maximum before daemon exit.