diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:53:08 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-12-05 12:53:08 -0500 |
commit | bb2166c898adb5fe29bc450004926802d2a16035 (patch) | |
tree | dc0a1d1219ab7e7324fbca533676d9d3a6a02c56 /kernel/irq/spurious.c | |
parent | 0bf7969feae831ede7276f7cc73b586ce0902374 (diff) | |
parent | 34769945f7cd9ab470413ffe64426e3ad069f49e (diff) |
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
Diffstat (limited to 'kernel/irq/spurious.c')
-rw-r--r-- | kernel/irq/spurious.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index bd7273e6282e..22b0a6eedf24 100644 --- a/kernel/irq/spurious.c +++ b/kernel/irq/spurious.c | |||
@@ -104,7 +104,7 @@ static int misrouted_irq(int irq) | |||
104 | return ok; | 104 | return ok; |
105 | } | 105 | } |
106 | 106 | ||
107 | static void poll_all_shared_irqs(void) | 107 | static void poll_spurious_irqs(unsigned long dummy) |
108 | { | 108 | { |
109 | struct irq_desc *desc; | 109 | struct irq_desc *desc; |
110 | int i; | 110 | int i; |
@@ -125,23 +125,11 @@ static void poll_all_shared_irqs(void) | |||
125 | try_one_irq(i, desc); | 125 | try_one_irq(i, desc); |
126 | local_irq_enable(); | 126 | local_irq_enable(); |
127 | } | 127 | } |
128 | } | ||
129 | |||
130 | static void poll_spurious_irqs(unsigned long dummy) | ||
131 | { | ||
132 | poll_all_shared_irqs(); | ||
133 | 128 | ||
134 | mod_timer(&poll_spurious_irq_timer, | 129 | mod_timer(&poll_spurious_irq_timer, |
135 | jiffies + POLL_SPURIOUS_IRQ_INTERVAL); | 130 | jiffies + POLL_SPURIOUS_IRQ_INTERVAL); |
136 | } | 131 | } |
137 | 132 | ||
138 | #ifdef CONFIG_DEBUG_SHIRQ | ||
139 | void debug_poll_all_shared_irqs(void) | ||
140 | { | ||
141 | poll_all_shared_irqs(); | ||
142 | } | ||
143 | #endif | ||
144 | |||
145 | /* | 133 | /* |
146 | * If 99,900 of the previous 100,000 interrupts have not been handled | 134 | * If 99,900 of the previous 100,000 interrupts have not been handled |
147 | * then assume that the IRQ is stuck in some manner. Drop a diagnostic | 135 | * then assume that the IRQ is stuck in some manner. Drop a diagnostic |