rpms/cpuspeed/devel cpuspeed.init, 1.35, 1.36 cpuspeed.spec, 1.62, 1.63

[Jarod Wilson (jwilson)]

Author: jwilson

Update of /cvs/pkgs/rpms/cpuspeed/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26774

Modified Files:
	cpuspeed.init cpuspeed.spec 
Log Message:
* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> 1.2.1-5
- Support for powernow-k8 as a kernel module



Index: cpuspeed.init
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.init,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- cpuspeed.init	7 Jul 2007 20:15:25 -0000	1.35
+++ cpuspeed.init	14 Feb 2008 22:37:58 -0000	1.36
@@ -112,10 +112,20 @@
 start() {
   if [ ! -f $lockfile ] && [ ! -d "$xendir" ]; then
     if ! some_file_exist $testpat ; then
+      cpu_vendor=$(grep vendor_id /proc/cpuinfo | awk '{print $3}' | tail -n 1)
+      cpu_family=$(grep "cpu family" /proc/cpuinfo | awk '{print $4}' | tail -n 1)
       # Attempt to load scaling_driver if not loaded
       # but it is configured
       if [ -n "$DRIVER" ]; then
         /sbin/modprobe "$DRIVER"
+      elif [ "$cpu_vendor" == AuthenticAMD ] && [ "$cpu_family" -ge 7 ]; then
+        # Try loading powernow-k8 if this is an AMD processor,
+        # family 7 or greater (Athlon XP/MP was family 6)
+	pk8m=$(/sbin/modinfo powernow-k8 2>&1 > /dev/null)
+	if [ "$?" -eq 0 ]; then
+          /sbin/modprobe powernow-k8 2> /dev/null
+          [ -d ${cpu0freqd} ] || /sbin/modprobe -r powernow-k8 2> /dev/null
+	fi
       else
         if [ -d /proc/acpi ]; then
           # use ACPI as a fallback 


Index: cpuspeed.spec
===================================================================
RCS file: /cvs/pkgs/rpms/cpuspeed/devel/cpuspeed.spec,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -r1.62 -r1.63
--- cpuspeed.spec	12 Feb 2008 22:51:14 -0000	1.62
+++ cpuspeed.spec	14 Feb 2008 22:37:58 -0000	1.63
@@ -1,7 +1,7 @@
 Summary:        CPU frequency adjusting daemon
 Name:           cpuspeed
 Version:        1.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Epoch:          1
 Group:          System Environment/Base
 License:        GPL
@@ -89,6 +89,9 @@
 exit 0
 
 %changelog
+* Thu Feb 14 2008 Jarod Wilson <jwilson at redhat.com> 1.2.1-5
+- Support for powernow-k8 as a kernel module
+
 * Tue Feb 12 2008 Jarod Wilson <jwilson at redhat.com> 1.2.1-4
 - Fix up for gcc 4.3
 - Work around multi-core step detection problems (#392781)