diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/irq.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/linux/irq.h b/include/linux/irq.h index 9de16ca8b8e5..7b59e193a119 100644 --- a/include/linux/irq.h +++ b/include/linux/irq.h | |||
@@ -315,10 +315,8 @@ extern unsigned int __do_IRQ(unsigned int irq); | |||
315 | * irqchip-style controller then we call the ->handle_irq() handler, | 315 | * irqchip-style controller then we call the ->handle_irq() handler, |
316 | * and it calls __do_IRQ() if it's attached to an irqtype-style controller. | 316 | * and it calls __do_IRQ() if it's attached to an irqtype-style controller. |
317 | */ | 317 | */ |
318 | static inline void generic_handle_irq(unsigned int irq) | 318 | static inline void generic_handle_irq_desc(unsigned int irq, struct irq_desc *desc) |
319 | { | 319 | { |
320 | struct irq_desc *desc = irq_to_desc(irq); | ||
321 | |||
322 | #ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ | 320 | #ifdef CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ |
323 | desc->handle_irq(irq, desc); | 321 | desc->handle_irq(irq, desc); |
324 | #else | 322 | #else |
@@ -329,6 +327,11 @@ static inline void generic_handle_irq(unsigned int irq) | |||
329 | #endif | 327 | #endif |
330 | } | 328 | } |
331 | 329 | ||
330 | static inline void generic_handle_irq(unsigned int irq) | ||
331 | { | ||
332 | generic_handle_irq_desc(irq, irq_to_desc(irq)); | ||
333 | } | ||
334 | |||
332 | /* Handling of unhandled and spurious interrupts: */ | 335 | /* Handling of unhandled and spurious interrupts: */ |
333 | extern void note_interrupt(unsigned int irq, struct irq_desc *desc, | 336 | extern void note_interrupt(unsigned int irq, struct irq_desc *desc, |
334 | int action_ret); | 337 | int action_ret); |