1 files changed, 19 insertions, 7 deletions

diff --git a/kernel/irq/migration.c b/kernel/irq/migration.c
index 86ae0eb80b53..8b8cecd18cce 100644
--- a/kernel/irq/migration.c
+++ b/kernel/irq/migration.c
@@ -38,17 +38,18 @@ bool irq_fixup_move_pending(struct irq_desc *desc, bool force_clear)
 void irq_move_masked_irq(struct irq_data *idata)
 {
         struct irq_desc *desc = irq_data_to_desc(idata);
-        struct irq_chip *chip = desc->irq_data.chip;
+        struct irq_data *data = &desc->irq_data;
+        struct irq_chip *chip = data->chip;
 
-        if (likely(!irqd_is_setaffinity_pending(&desc->irq_data)))
+        if (likely(!irqd_is_setaffinity_pending(data)))
                 return;
 
-        irqd_clr_move_pending(&desc->irq_data);
+        irqd_clr_move_pending(data);
 
         /*
          * Paranoia: cpu-local interrupts shouldn't be calling in here anyway.
          */
-        if (irqd_is_per_cpu(&desc->irq_data)) {
+        if (irqd_is_per_cpu(data)) {
                 WARN_ON(1);
                 return;
         }
@@ -73,9 +74,20 @@ void irq_move_masked_irq(struct irq_data *idata)
          * For correct operation this depends on the caller
          * masking the irqs.
          */
-        if (cpumask_any_and(desc->pending_mask, cpu_online_mask) < nr_cpu_ids)
-                irq_do_set_affinity(&desc->irq_data, desc->pending_mask, false);
-
+        if (cpumask_any_and(desc->pending_mask, cpu_online_mask) < nr_cpu_ids) {
+                int ret;
+
+                ret = irq_do_set_affinity(data, desc->pending_mask, false);
+                /*
+                 * If the there is a cleanup pending in the underlying
+                 * vector management, reschedule the move for the next
+                 * interrupt. Leave desc->pending_mask intact.
+                 */
+                if (ret == -EBUSY) {
+                        irqd_set_move_pending(data);
+                        return;
+                }
+        }
         cpumask_clear(desc->pending_mask);
 }