Merge branch 'linus' into irq/genirq

diff --combined kernel/irq/chip.c
index 0ad02d76a0c4b783487740c27a47bc0d8323b66f,f63c706d25e15f481f61548dd248d1eaf69702bb..9a7fbb84f5651894891e8c9c591cc2da55593e91
--- 1/kernel/irq/chip.c
--- 2/kernel/irq/chip.c
+++ b/kernel/irq/chip.c
@@@ -46,7 -46,7 +46,7 @@@ void dynamic_irq_init(unsigned int irq
        desc->irq_count = 0;
        desc->irqs_unhandled = 0;
  #ifdef CONFIG_SMP
-       cpus_setall(desc->affinity);
+       cpumask_setall(&desc->affinity);
  #endif
        spin_unlock_irqrestore(&desc->lock, flags);
  }
@@@ -290,8 -290,7 +290,8 @@@ static inline void mask_ack_irq(struct 
                desc->chip->mask_ack(irq);
        else {
                desc->chip->mask(irq);
 -              desc->chip->ack(irq);
 +              if (desc->chip->ack)
 +                      desc->chip->ack(irq);
        }
  }
  
@@@ -476,8 -475,7 +476,8 @@@ handle_edge_irq(unsigned int irq, struc
        kstat_incr_irqs_this_cpu(irq, desc);
  
        /* Start handling the irq */
 -      desc->chip->ack(irq);
 +      if (desc->chip->ack)
 +              desc->chip->ack(irq);
        desc = irq_remap_to_desc(irq, desc);
  
        /* Mark the IRQ currently in progress.*/