[arch-commits] Commit in linux-tools/trunk (01-cpupower-governor-fix.patch PKGBUILD)

[Sébastien Luttringer]

    Date: Thursday, August 18, 2016 @ 00:28:51
  Author: seblu
Revision: 186929

upgpkg: linux-tools 4.7-2

- FS#50202

Added:
  linux-tools/trunk/01-cpupower-governor-fix.patch
Modified:
  linux-tools/trunk/PKGBUILD

--------------------------------+
 01-cpupower-governor-fix.patch |   31 +++++++++++++++++++++++++++++++
 PKGBUILD                       |    6 +++++-
 2 files changed, 36 insertions(+), 1 deletion(-)

Added: 01-cpupower-governor-fix.patch
===================================================================
--- 01-cpupower-governor-fix.patch	                        (rev 0)
+++ 01-cpupower-governor-fix.patch	2016-08-18 00:28:51 UTC (rev 186929)
@@ -0,0 +1,31 @@
+diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c
+index b4bf769..f2d1bbd 100644
+--- a/tools/power/cpupower/utils/cpufreq-set.c
++++ b/tools/power/cpupower/utils/cpufreq-set.c
+@@ -296,9 +296,10 @@ int cmd_freq_set(int argc, char **argv)
+ 			struct cpufreq_affected_cpus *cpus;
+ 
+ 			if (!bitmask_isbitset(cpus_chosen, cpu) ||
+-			    cpupower_is_cpu_online(cpu))
++			    cpupower_is_cpu_online(cpu) != 1)
+ 				continue;
+ 
++
+ 			cpus = cpufreq_get_related_cpus(cpu);
+ 			if (!cpus)
+ 				break;
+@@ -316,11 +317,10 @@ int cmd_freq_set(int argc, char **argv)
+ 	     cpu <= bitmask_last(cpus_chosen); cpu++) {
+ 
+ 		if (!bitmask_isbitset(cpus_chosen, cpu) ||
+-		    cpupower_is_cpu_online(cpu))
+-			continue;
+-
+-		if (cpupower_is_cpu_online(cpu) != 1)
++		    cpupower_is_cpu_online(cpu) != 1) {
++      printf(_("Ignoring cpu: %d\n"), cpu);
+ 			continue;
++    }
+ 
+ 		printf(_("Setting cpu: %d\n"), cpu);
+ 		ret = do_one_cpu(cpu, &new_pol, freq, policychange);

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-17 23:07:24 UTC (rev 186928)
+++ PKGBUILD	2016-08-18 00:28:51 UTC (rev 186929)
@@ -14,7 +14,7 @@
   'x86_energy_perf_policy'
 )
 pkgver=4.7
-pkgrel=1
+pkgrel=2
 license=('GPL2')
 arch=('i686' 'x86_64')
 url='http://www.kernel.org'
@@ -37,6 +37,7 @@
         'cpupower.systemd'
         'cpupower.service'
         'usbipd.service'
+        '01-cpupower-governor-fix.patch'
         '02-archlinux-paths.patch'
         '04-fix-usip-h-path.patch')
 md5sums=('SKIP'
@@ -44,11 +45,14 @@
          '34f5ecc19770a1abbcd0fd65bfd1f065'
          '86c4e419e4ba80835c330d49ba3f56ad'
          'bb35634f480325a78b943f7e10165e86'
+         '33c871519adfd4e5575643c4579d019b'
          '1bc4f8c7a21a30e1a873d07e69fb698b'
          'a73ea3ea6d9c9ecb1cc910871eead3ff')
 
 prepare() {
   cd linux
+  # apply stable kernel patch
+  #xz -kcd "$srcdir"/patch-4.7.1.xz | patch -p1 -N
   # apply patch from the source array (should be a pacman feature)
   local filename
   for filename in "${source[@]}"; do