Merge branch 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux...

* 'genirq' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: remove extraneous checks in manage.c
  genirq: Expose default irq affinity mask (take 3)

diff --combined include/linux/interrupt.h
index a86186d,043400f..62aa4f8
--- 1/include/linux/interrupt.h
--- 2/include/linux/interrupt.h
+++ b/include/linux/interrupt.h
@@@ -104,8 -104,11 +104,11 @@@ extern void enable_irq(unsigned int irq
  
  #if defined(CONFIG_SMP) && defined(CONFIG_GENERIC_HARDIRQS)
  
+ extern cpumask_t irq_default_affinity;
+ 
  extern int irq_set_affinity(unsigned int irq, cpumask_t cpumask);
  extern int irq_can_set_affinity(unsigned int irq);
+ extern int irq_select_affinity(unsigned int irq);
  
  #else /* CONFIG_SMP */
  
@@@ -119,6 -122,8 +122,8 @@@ static inline int irq_can_set_affinity(
        return 0;
  }
  
+ static inline int irq_select_affinity(unsigned int irq)  { return 0; }
+ 
  #endif /* CONFIG_SMP && CONFIG_GENERIC_HARDIRQS */
  
  #ifdef CONFIG_GENERIC_HARDIRQS
@@@ -285,11 -290,12 +290,11 @@@ enu
  struct softirq_action
  {
        void    (*action)(struct softirq_action *);
 -      void    *data;
  };
  
  asmlinkage void do_softirq(void);
  asmlinkage void __do_softirq(void);
 -extern void open_softirq(int nr, void (*action)(struct softirq_action*), void *data);
 +extern void open_softirq(int nr, void (*action)(struct softirq_action *));
  extern void softirq_init(void);
  #define __raise_softirq_irqoff(nr) do { or_softirq_pending(1UL << (nr)); } while (0)
  extern void raise_softirq_irqoff(unsigned int nr);