Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Pull irq updates from Thomas Gleixner:
 "This updated pull request does not contain the last few GIC related
  patches which were reported to cause a regression.  There is a fix
  available, but I let it breed for a couple of days first.

  The irq departement provides:

   - new infrastructure to support non PCI based MSI interrupts
   - a couple of new irq chip drivers
   - the usual pile of fixlets and updates to irq chip drivers
   - preparatory changes for removal of the irq argument from interrupt
     flow handlers
   - preparatory changes to remove IRQF_VALID"

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (129 commits)
  irqchip/imx-gpcv2: IMX GPCv2 driver for wakeup sources
  irqchip: Add bcm2836 interrupt controller for Raspberry Pi 2
  irqchip: Add documentation for the bcm2836 interrupt controller
  irqchip/bcm2835: Add support for being used as a second level controller
  irqchip/bcm2835: Refactor handle_IRQ() calls out of MAKE_HWIRQ
  PCI: xilinx: Fix typo in function name
  irqchip/gic: Ensure gic_cpu_if_up/down() programs correct GIC instance
  irqchip/gic: Only allow the primary GIC to set the CPU map
  PCI/MSI: pci-xgene-msi: Consolidate chained IRQ handler install/remove
  unicore32/irq: Prepare puv3_gpio_handler for irq argument removal
  tile/pci_gx: Prepare trio_handle_level_irq for irq argument removal
  m68k/irq: Prepare irq handlers for irq argument removal
  C6X/megamode-pic: Prepare megamod_irq_cascade for irq argument removal
  blackfin: Prepare irq handlers for irq argument removal
  arc/irq: Prepare idu_cascade_isr for irq argument removal
  sparc/irq: Use access helper irq_data_get_affinity_mask()
  sparc/irq: Use helper irq_data_get_irq_handler_data()
  parisc/irq: Use access helper irq_data_get_affinity_mask()
  mn10300/irq: Use access helper irq_data_get_affinity_mask()
  irqchip/i8259: Prepare i8259_irq_dispatch for irq argument removal
  ...

2 files changed, 8 insertions, 7 deletions

diff --git a/arch/mn10300/kernel/cevt-mn10300.c b/arch/mn10300/kernel/cevt-mn10300.c
index 3aae9f5a98aa..d9b34dd44f04 100644
--- a/arch/mn10300/kernel/cevt-mn10300.c
+++ b/arch/mn10300/kernel/cevt-mn10300.c
@@ -116,7 +116,7 @@ int __init init_clockevents(void)
         {
                 struct irq_data *data;
                 data = irq_get_irq_data(cd->irq);
-                cpumask_copy(data->affinity, cpumask_of(cpu));
+                cpumask_copy(irq_data_get_affinity_mask(data), cpumask_of(cpu));
                 iact->flags |= IRQF_NOBALANCING;
         }
 #endif
diff --git a/arch/mn10300/kernel/irq.c b/arch/mn10300/kernel/irq.c
index 480de70f4059..c716437baa2c 100644
--- a/arch/mn10300/kernel/irq.c
+++ b/arch/mn10300/kernel/irq.c
@@ -87,7 +87,8 @@ static void mn10300_cpupic_mask_ack(struct irq_data *d)
                 tmp2 = GxICR(irq);
 
                 irq_affinity_online[irq] =
-                        cpumask_any_and(d->affinity, cpu_online_mask);
+                        cpumask_any_and(irq_data_get_affinity_mask(d),
+                                        cpu_online_mask);
                 CROSS_GxICR(irq, irq_affinity_online[irq]) =
                         (tmp & (GxICR_LEVEL | GxICR_ENABLE)) | GxICR_DETECT;
                 tmp = CROSS_GxICR(irq, irq_affinity_online[irq]);
@@ -124,7 +125,7 @@ static void mn10300_cpupic_unmask_clear(struct irq_data *d)
         } else {
                 tmp = GxICR(irq);
 
-                irq_affinity_online[irq] = cpumask_any_and(d->affinity,
+                irq_affinity_online[irq] = cpumask_any_and(irq_data_get_affinity_mask(d),
                                                            cpu_online_mask);
                 CROSS_GxICR(irq, irq_affinity_online[irq]) = (tmp & GxICR_LEVEL) | GxICR_ENABLE | GxICR_DETECT;
                 tmp = CROSS_GxICR(irq, irq_affinity_online[irq]);
@@ -316,15 +317,16 @@ void migrate_irqs(void)
         self = smp_processor_id();
         for (irq = 0; irq < NR_IRQS; irq++) {
                 struct irq_data *data = irq_get_irq_data(irq);
+                struct cpumask *mask = irq_data_get_affinity_mask(data);
 
                 if (irqd_is_per_cpu(data))
                         continue;
 
-                if (cpumask_test_cpu(self, data->affinity) &&
+                if (cpumask_test_cpu(self, mask) &&
                     !cpumask_intersects(&irq_affinity[irq], cpu_online_mask)) {
                         int cpu_id;
                         cpu_id = cpumask_first(cpu_online_mask);
-                        cpumask_set_cpu(cpu_id, data->affinity);
+                        cpumask_set_cpu(cpu_id, mask);
                 }
                 /* We need to operate irq_affinity_online atomically. */
                 arch_local_cli_save(flags);
@@ -335,8 +337,7 @@ void migrate_irqs(void)
                         GxICR(irq) = x & GxICR_LEVEL;
                         tmp = GxICR(irq);
 
-                        new = cpumask_any_and(data->affinity,
-                                              cpu_online_mask);
+                        new = cpumask_any_and(mask, cpu_online_mask);
                         irq_affinity_online[irq] = new;
 
                         CROSS_GxICR(irq, new) =