Merge branch 'linus' into irq/core

Pick up upstream changes to avoid conflicts for pending patches.

1 files changed, 3 insertions, 0 deletions

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 1ca39dc4538d..3f8a8ebda484 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);