diff options
| -rw-r--r-- | include/linux/interrupt.h | 6 | ||||
| -rw-r--r-- | kernel/irq/spurious.c | 14 |
2 files changed, 1 insertions, 19 deletions
diff --git a/include/linux/interrupt.h b/include/linux/interrupt.h index 7ca72b74eec7..75f3f00ac1e5 100644 --- a/include/linux/interrupt.h +++ b/include/linux/interrupt.h | |||
| @@ -603,12 +603,6 @@ static inline void init_irq_proc(void) | |||
| 603 | } | 603 | } |
| 604 | #endif | 604 | #endif |
| 605 | 605 | ||
| 606 | #if defined(CONFIG_GENERIC_HARDIRQS) && defined(CONFIG_DEBUG_SHIRQ) | ||
| 607 | extern void debug_poll_all_shared_irqs(void); | ||
| 608 | #else | ||
| 609 | static inline void debug_poll_all_shared_irqs(void) { } | ||
| 610 | #endif | ||
| 611 | |||
| 612 | struct seq_file; | 606 | struct seq_file; |
| 613 | int show_interrupts(struct seq_file *p, void *v); | 607 | int show_interrupts(struct seq_file *p, void *v); |
| 614 | 608 | ||
diff --git a/kernel/irq/spurious.c b/kernel/irq/spurious.c index 114e704760fe..8996b98f9eb2 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; |
| @@ -123,23 +123,11 @@ static void poll_all_shared_irqs(void) | |||
| 123 | 123 | ||
| 124 | try_one_irq(i, desc); | 124 | try_one_irq(i, desc); |
| 125 | } | 125 | } |
| 126 | } | ||
| 127 | |||
| 128 | static void poll_spurious_irqs(unsigned long dummy) | ||
| 129 | { | ||
| 130 | poll_all_shared_irqs(); | ||
| 131 | 126 | ||
| 132 | mod_timer(&poll_spurious_irq_timer, | 127 | mod_timer(&poll_spurious_irq_timer, |
| 133 | jiffies + POLL_SPURIOUS_IRQ_INTERVAL); | 128 | jiffies + POLL_SPURIOUS_IRQ_INTERVAL); |
| 134 | } | 129 | } |
| 135 | 130 | ||
| 136 | #ifdef CONFIG_DEBUG_SHIRQ | ||
| 137 | void debug_poll_all_shared_irqs(void) | ||
| 138 | { | ||
| 139 | poll_all_shared_irqs(); | ||
| 140 | } | ||
| 141 | #endif | ||
| 142 | |||
| 143 | /* | 131 | /* |
| 144 | * If 99,900 of the previous 100,000 interrupts have not been handled | 132 | * If 99,900 of the previous 100,000 interrupts have not been handled |
| 145 | * then assume that the IRQ is stuck in some manner. Drop a diagnostic | 133 | * then assume that the IRQ is stuck in some manner. Drop a diagnostic |
