stable-proposed-updates: considering cpufrequtils

[Mattia Dongili <malattia@linux.it>]

Hi Release Team,

I'm wondering if it's worth updating cpufrequtils in Squeeze to the
current version in testing/unstable.
There are a couple of fixes that are worth considering in there and
namely: fixing support for linux 3.0 (some modules have been moved
and broke assumptions in cpufrequtils init scripts) and support for AMD
family 20 CPUs.
There are extra harmless changes, if necessary I can uppload to spu a
new package that only contains the two fixes above.

The diff since Squeeze is:

diff --git a/debian/changelog b/debian/changelog
index cf79284..e746194 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+cpufrequtils (007-2) unstable; urgency=low
+
+  * Bulk load only helper modules. Linux 3.0 shuffled cpufreq modules
+    locations a bit and now cpu drivers and helpers are in the same directory
+    (closes: #636141).
+  * Use modprobe -b in loadcpufreq to honour blacklisted modules
+    (closes: #592488).
+  * Load powernow-k8 for AMD family 20 (i.e. AMD E-350 cpus)
+    (closes: #627811).
+  * Stop changing printk levels when loading cpufreq modules (closes: #624575
+    and closes: #596235).
+
+ -- Mattia Dongili <malattia@debian.org>  Wed, 03 Aug 2011 18:13:41 +0900
+
 cpufrequtils (007-1) unstable; urgency=low
 
   * New upstream version
diff --git a/debian/cpufrequtils.loadcpufreq.init b/debian/cpufrequtils.loadcpufreq.init
index 0738441..d216035 100644
--- a/debian/cpufrequtils.loadcpufreq.init
+++ b/debian/cpufrequtils.loadcpufreq.init
@@ -37,6 +37,8 @@ set -e
 # if not enabled then exit gracefully
 [ "$ENABLE" = "true" ] || exit 0
 
+MODPROBE="modprobe -b"
+
 load_detected_cpufreq_modules() {
     #if /usr/sbin/laptop-detect; then LAPTOP=1; fi
     CPUINFO=/proc/cpuinfo
@@ -117,7 +119,7 @@ load_detected_cpufreq_modules() {
                     # K7
                     MODULE=powernow-k7
                     ;;
-                15|16|17)
+                15|16|17|20)
                     # K8
                     MODULE=powernow-k8
                     ;;
@@ -149,18 +151,14 @@ load_detected_cpufreq_modules() {
 }
 
 load_modules() {
-        #stop the kernel printk'ing at all while we load.
-        PRINTK=$(cat /proc/sys/kernel/printk)
-        [ "$VERBOSE" = no ] && echo "1 1 1 1" > /proc/sys/kernel/printk
-
         #build a list of current modules so we don't load a module twice
         LIST=$(/sbin/lsmod|awk '!/Module/ {print $1}')
 
         #get list of available modules (governors and helpers)
         LOC="/lib/modules/$(uname -r)/kernel/drivers/cpufreq"
         if [ -d $LOC ]; then
-          MODAVAIL=$( ( find $LOC -type f -name "*.o" -printf "basename %f .o\n"; \
-	      find $LOC -type f -name "*.ko" -printf "basename %f .ko\n" ) | /bin/sh)
+          MODAVAIL=$( ( find $LOC -type f -name "cpufreq_*.o" -printf "basename %f .o\n"; \
+	      find $LOC -type f -name "cpufreq_*.ko" -printf "basename %f .ko\n" ) | /bin/sh)
         else
           MODAVAIL=""
         fi
@@ -168,34 +166,31 @@ load_modules() {
         #echo "Loading cpufreq modules:"
         for mod in $MODAVAIL; do
         #        echo "     $mod"
-                echo $LIST| grep -q -w "$mod" || modprobe $mod >/dev/null || /bin/true
+                echo $LIST| grep -q -w "$mod" || $MODPROBE $mod >/dev/null || /bin/true
         done
 
         #cpufreq is built in on powerpc; just return
         if [ "$(uname -m)" = "ppc" ]; then
-                echo "$PRINTK" > /proc/sys/kernel/printk
                 return 0
         fi
 
         #new style detection system
         if [ ! "$FREQDRIVER" = "" ]; then 
 		# user overridden value in /etc/default/loadcpufreq
-                modprobe "$FREQDRIVER"
+                $MODPROBE "$FREQDRIVER"
 		MODULE="$FREQDRIVER"
         else
 	        load_detected_cpufreq_modules
 		if [ ! -z "$MODULE" ] || [ ! -z "$MODULE_FALLBACK" ] ; then
-		    if [ ! -z "$MODULE" ] && modprobe "$MODULE" 2>/dev/null ; then
+		    if [ ! -z "$MODULE" ] && $MODPROBE "$MODULE" 2>/dev/null ; then
 			:
-		    elif modprobe "$MODULE_FALLBACK" 2>/dev/null ; then
+		    elif $MODPROBE "$MODULE_FALLBACK" 2>/dev/null ; then
 			MODULE="$MODULE_FALLBACK"
 		    else
 			unset MODULE
 		    fi
 		fi
         fi
-
-        echo "$PRINTK" > /proc/sys/kernel/printk
 }
 
 check_kernel() {
-- 
mattia
:wq!