From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Dec 2009 17:53:08 +0000 (-0800)
Subject: Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v2.6.33-rc1~402
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=bb2166c898adb5fe29bc450004926802d2a16035;p=~shefty%2Frdma-dev.git

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

* '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
---

bb2166c898adb5fe29bc450004926802d2a16035
diff --cc kernel/irq/spurious.c
index bd7273e6282,8996b98f9eb..22b0a6eedf2
--- a/kernel/irq/spurious.c
+++ b/kernel/irq/spurious.c
@@@ -121,15 -121,8 +121,10 @@@ static void poll_spurious_irqs(unsigne
  		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);