diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-09-15 20:33:16 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2016-09-15 20:33:16 +0200 |
commit | 5d7b980d04925877258f447dc3cdd2688f71a210 (patch) | |
tree | a378672ea2c75b246b31cdc182b6081e6a97dfab | |
parent | fc449d62a3c2147a396362681604693d87106991 (diff) | |
parent | 1eab470c4d79406a89fb73344bbef90c47497824 (diff) | |
download | kernel-5d7b980d04925877258f447dc3cdd2688f71a210.tar.gz kernel-5d7b980d04925877258f447dc3cdd2688f71a210.tar.xz kernel-5d7b980d04925877258f447dc3cdd2688f71a210.zip |
Merge remote-tracking branch 'origin/f24' into f24-user-thl-vanilla-fedora
-rw-r--r-- | 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch | 49 | ||||
-rw-r--r-- | 0001-iio-Use-event-header-from-kernel-tree.patch | 64 | ||||
-rw-r--r-- | kernel.spec | 10 |
3 files changed, 123 insertions, 0 deletions
diff --git a/0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch b/0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch new file mode 100644 index 000000000..05b8cf999 --- /dev/null +++ b/0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch @@ -0,0 +1,49 @@ +From 9f692cbe4a01dd9e3c3e954ec6b59662b68f9ce4 Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Fri, 9 Sep 2016 10:19:02 -0700 +Subject: [PATCH] cpupower: Correct return type of cpu_power_is_cpu_online in + cpufreq +To: Thomas Renninger <trenn@suse.com> +Cc: linux-pm@vger.kernel.org +Cc: linux-kernel@vger.kernel.org + +When converting to a shared library in ac5a181d065d ("cpupower: Add +cpuidle parts into library"), cpu_freq_cpu_exists was converted to +cpupower_is_cpu_online. cpu_req_cpu_exists returned 0 on success and +-ENOSYS on failure whereas cpupower_is_cpu_online returns 1 on success. +Check for the correct return value in cpufreq-set. + +See https://bugzilla.redhat.com/show_bug.cgi?id=1374212 + +Fixes: ac5a181d065d ("cpupower: Add cpuidle parts into library") +Reported-by: Julian Seward <jseward@acm.org> +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + tools/power/cpupower/utils/cpufreq-set.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tools/power/cpupower/utils/cpufreq-set.c b/tools/power/cpupower/utils/cpufreq-set.c +index b4bf769..8971d71 100644 +--- a/tools/power/cpupower/utils/cpufreq-set.c ++++ b/tools/power/cpupower/utils/cpufreq-set.c +@@ -296,7 +296,7 @@ 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); +@@ -316,7 +316,7 @@ 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)) ++ cpupower_is_cpu_online(cpu) != 1) + continue; + + if (cpupower_is_cpu_online(cpu) != 1) +-- +2.10.0 + diff --git a/0001-iio-Use-event-header-from-kernel-tree.patch b/0001-iio-Use-event-header-from-kernel-tree.patch new file mode 100644 index 000000000..1724db3fd --- /dev/null +++ b/0001-iio-Use-event-header-from-kernel-tree.patch @@ -0,0 +1,64 @@ +From 0eadbb65c0026fb4eec89c54f6b48a0febd87f92 Mon Sep 17 00:00:00 2001 +From: Laura Abbott <labbott@redhat.com> +Date: Fri, 9 Sep 2016 08:19:17 -0700 +Subject: [PATCH] iio: Use type header from kernel tree +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit +To: Jonathan Cameron <jic23@kernel.org> +To: Hartmut Knaack <knaack.h@gmx.de> +To: Lars-Peter Clausen <lars@metafoo.de> +To: Peter Meerwald-Stadler <pmeerw@pmeerw.net> +Cc: linux-iio@vger.kernel.org +Cc: linux-kernel@vger.kernel.org + + +The iio tools have been updated as new event types have been added to +the kernel. The tools currently use the standard system headers which +means that the system may not have the newest defintitions. This leads +to build failures when building newer tools on older hosts: + +gcc -Wall -g -D_GNU_SOURCE -c -o iio_event_monitor.o +iio_event_monitor.c +iio_event_monitor.c:59:3: error: ‘IIO_UVINDEX’ undeclared here (not in a +function) + [IIO_UVINDEX] = "uvindex", + ^~~~~~~~~~~ +iio_event_monitor.c:59:3: error: array index in initializer not of +integer type +iio_event_monitor.c:59:3: note: (near initialization for +‘iio_chan_type_name_spec’) +iio_event_monitor.c:97:3: error: ‘IIO_MOD_LIGHT_UV’ undeclared here (not +in a function) + [IIO_MOD_LIGHT_UV] = "uv", + ^~~~~~~~~~~~~~~~ +iio_event_monitor.c:97:3: error: array index in initializer not of +integer type +iio_event_monitor.c:97:3: note: (near initialization for +‘iio_modifier_names’) +<builtin>: recipe for target 'iio_event_monitor.o' failed + +Switch to using the header from the kernel tree to ensure the newest +defintions are always picked up. + +Signed-off-by: Laura Abbott <labbott@redhat.com> +--- + tools/iio/iio_event_monitor.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tools/iio/iio_event_monitor.c b/tools/iio/iio_event_monitor.c +index d9b7e0f..f02523d 100644 +--- a/tools/iio/iio_event_monitor.c ++++ b/tools/iio/iio_event_monitor.c +@@ -26,7 +26,7 @@ + #include <sys/ioctl.h> + #include "iio_utils.h" + #include <linux/iio/events.h> +-#include <linux/iio/types.h> ++#include "../../include/uapi/linux/iio/types.h" + + static const char * const iio_chan_type_name_spec[] = { + [IIO_VOLTAGE] = "voltage", +-- +2.7.4 + diff --git a/kernel.spec b/kernel.spec index 5faf10054..07702784b 100644 --- a/kernel.spec +++ b/kernel.spec @@ -658,6 +658,12 @@ Patch861: 0001-cgroup-reduce-read-locked-section-of-cgroup_threadgr.patch #rhbz 1350174 Patch862: tip-x86-boot-x86-KASLR-x86-power-Remove-x86-hibernation-restrictions.patch +#rhbz 1374212 +Patch863: 0001-cpupower-Correct-return-type-of-cpu_power_is_cpu_onl.patch + +#ongoing complaint, full discussion delayed until ksummit/plumbers +Patch864: 0001-iio-Use-event-header-from-kernel-tree.patch + # END OF PATCH DEFINITIONS %endif @@ -2188,6 +2194,10 @@ fi # # %changelog +* Wed Sep 14 2016 Laura Abbott <labbott@fedoraproject.org> +- Fix for incorrect return checking in cpupower (rhbz 1374212) +- Let iio tools build on older kernels + * Wed Sep 07 2016 <labbott@fedoraproject.org> - 4.7.3-200 - Linux v4.7.3 - Silence KASLR warning (rhbz 1350174) |