From: Christian Hofstaedtler <ch@grml.org>
Date: Sun, 11 Dec 2011 03:18:37 +0000 (+0100)
Subject: Don't load cpufreq_ondemand if it's built-in
X-Git-Tag: v0.9.40~1
X-Git-Url: http://git.grml.org/?p=grml-autoconfig.git;a=commitdiff_plain;h=b5300e25ae3be33247acc1fde819d7cf2b6e9880

Don't load cpufreq_ondemand if it's built-in
---

diff --git a/autoconfig.functions b/autoconfig.functions
index a0e6f17..1a3488b 100755
--- a/autoconfig.functions
+++ b/autoconfig.functions
@@ -960,14 +960,18 @@ if [ -x /etc/init.d/loadcpufreq ] ; then
    rm -f $LOADCPUFREQ
 
    if [ -z "$SKIP_CPU_GOVERNOR" ] ; then
-      einfo "Loading cpufreq_ondemand, setting ondemand governor"
-      RC=0
-      if modprobe cpufreq_ondemand ; RC=$? ; then
-         for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do
-            echo ondemand > $file
-         done
-      fi
-      eend $RC
+     if grep -vq ondemand /sys/devices/system/cpu/cpu0/cpufreq/scaling_available_governors; then
+       einfo "Loading cpufreq_ondemand"
+       modprobe cpufreq_ondemand
+       eend $?
+     fi
+
+     einfo "Setting ondemand governor"
+     RC=0
+     for file in $(find /sys/devices/system/cpu/ -name scaling_governor 2>/dev/null) ; do
+       echo ondemand > $file || RC=1
+     done
+     eend $RC
    fi # cpu-governor
 
    eoutdent