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

* 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Fix spurious irq seqfile conversion
  genirq: switch /proc/irq/*/spurious to seq_file
  irq: Do not attempt to create subdirectories if /proc/irq/<irq> failed
  irq: Remove unused debug_poll_all_shared_irqs()
  irq: Fix docbook comments
  irq: trivial: Fix typo in comment for #endif

diff --combined kernel/irq/spurious.c
index bd7273e6282ecf65a015c1e02239959497753a06,8996b98f9eb2e96095cbba0f2dd058411b289ab2..22b0a6eedf2427c4b2a7addb23c65cd1fea1c285
--- 1/kernel/irq/spurious.c
--- 2/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@@ -104,7 -104,7 +104,7 @@@ static int misrouted_irq(int irq
        return ok;
  }
  
- static void poll_all_shared_irqs(void)
+ static void poll_spurious_irqs(unsigned long dummy)
  {
        struct irq_desc *desc;
        int i;
@@@ -121,27 -121,13 +121,15 @@@
                if (!(status & IRQ_SPURIOUS_DISABLED))
                        continue;
  
 +              local_irq_disable();
                try_one_irq(i, desc);
 +              local_irq_enable();
        }
- }
- 
- static void poll_spurious_irqs(unsigned long dummy)
- {
-       poll_all_shared_irqs();
  
        mod_timer(&poll_spurious_irq_timer,
                  jiffies + POLL_SPURIOUS_IRQ_INTERVAL);
  }
  
- #ifdef CONFIG_DEBUG_SHIRQ
- void debug_poll_all_shared_irqs(void)
- {
-       poll_all_shared_irqs();
- }
- #endif
- 
  /*
   * If 99,900 of the previous 100,000 interrupts have not been handled
   * then assume that the IRQ is stuck in some manner. Drop a diagnostic