summaryrefslogtreecommitdiffstats
path: root/kernel/irq
diff options
context:
space:
mode:
authorLinus Walleij <linus.walleij@linaro.org>2019-02-17 21:59:33 +0100
committerLinus Walleij <linus.walleij@linaro.org>2019-02-17 21:59:33 +0100
commit8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d (patch)
tree18cdadced0870584ceffa02eed47f4c86da8263c /kernel/irq
parent760a160e8b899f5ebcab99da17feebbe40ec42f1 (diff)
parent68b7587baabfa42ca5625b709691358fee51b9d8 (diff)
downloadlinux-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.tar.gz
linux-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.tar.bz2
linux-8fab3d713ca36bf4ad4dadec0bf38f5e70b8999d.zip
Merge tag 'gpio-v5.1-updates-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into devel
gpio updates for v5.1 - support for a new variant of pca953x - documentation fix from Wolfram - some tegra186 name changes - two minor fixes for madera and altera-a10sr
Diffstat (limited to 'kernel/irq')
-rw-r--r--kernel/irq/irqdesc.c2
-rw-r--r--kernel/irq/manage.c3
2 files changed, 4 insertions, 1 deletions
diff --git a/kernel/irq/irqdesc.c b/kernel/irq/irqdesc.c
index ee062b7939d3..ef8ad36cadcf 100644
--- a/kernel/irq/irqdesc.c
+++ b/kernel/irq/irqdesc.c
@@ -457,7 +457,7 @@ static int alloc_descs(unsigned int start, unsigned int cnt, int node,
/* Validate affinity mask(s) */
if (affinity) {
- for (i = 0; i < cnt; i++, i++) {
+ for (i = 0; i < cnt; i++) {
if (cpumask_empty(&affinity[i].mask))
return -EINVAL;
}
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index a4888ce4667a..84b54a17b95d 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -393,6 +393,9 @@ int irq_setup_affinity(struct irq_desc *desc)
}
cpumask_and(&mask, cpu_online_mask, set);
+ if (cpumask_empty(&mask))
+ cpumask_copy(&mask, cpu_online_mask);
+
if (node != NUMA_NO_NODE) {
const struct cpumask *nodemask = cpumask_of_node(node);