rpms/cpuspeed/FC-6 cpuspeed.init,1.13,1.14 cpuspeed.spec,1.40,1.41

[fedora-cvs-commits at redhat.com]

Author: davej

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

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Sun Nov 12 2006 Dave Jones <davej at redhat.com>
- Fix the 'FATAL: Error inserting acpi_cpufreq' problem.



Index: cpuspeed.init
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-6/cpuspeed.init,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- cpuspeed.init	29 Jul 2006 06:59:15 -0000	1.13
+++ cpuspeed.init	12 Nov 2006 05:59:08 -0000	1.14
@@ -28,8 +28,15 @@
 				/sbin/modprobe "$DRIVER"
 			else
 				if [ -d /proc/acpi ]; then
-					# use ACPI as a fallback
-					/sbin/modprobe acpi-cpufreq
+					EST=`grep flags /proc/cpuinfo | grep est`
+					if [ "$EST" ]; then
+						# use ACPI as a fallback
+						/sbin/modprobe acpi-cpufreq
+						# even ACPI didn't work, remove it, and bail out.
+						if [ -d /sys/devices/system/cpu/cpu0/cpufreq ]; then
+							/sbin/rmmod acpi-cpufreq
+						fi
+					fi
 				else
 					# This is a no-ACPI machine. Just exit.
 					return 0


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/dist/rpms/cpuspeed/FC-6/cpuspeed.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- cpuspeed.spec	29 Jul 2006 06:59:15 -0000	1.40
+++ cpuspeed.spec	12 Nov 2006 05:59:08 -0000	1.41
@@ -72,6 +72,9 @@
 exit 0
 
 %changelog
+* Sun Nov 12 2006 Dave Jones <davej at redhat.com>
+- Fix the 'FATAL: Error inserting acpi_cpufreq' problem.
+
 * Sat Jul 29 2006 Dave Jones <davej at redhat.com>
 - Don't try to load acpi-cpufreq on non-ACPI machines. (#196446)