From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 12 Oct 2017 09:02:50 +0000 (+0200)
Subject: Merge branch 'irq/urgent' into x86/apic
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=331b57d14829c49d75076779cdc54d7e4537bbf0;p=linux.git

Merge branch 'irq/urgent' into x86/apic

Pick up core changes which affect the vector rework.
---

331b57d14829c49d75076779cdc54d7e4537bbf0
diff --cc kernel/irq/chip.c
index 82333835ac66e,5a2ef92c2782c..043bfc35b3534
--- a/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -271,11 -265,10 +271,11 @@@ int irq_startup(struct irq_desc *desc, 
  			irq_setup_affinity(desc);
  			break;
  		case IRQ_STARTUP_MANAGED:
+ 			irq_do_set_affinity(d, aff, false);
  			ret = __irq_startup(desc);
- 			irq_set_affinity_locked(d, aff, false);
  			break;
  		case IRQ_STARTUP_ABORT:
 +			irqd_set_managed_shutdown(d);
  			return 0;
  		}
  	}