From fb0e19a60f357727b5cbe6bd099df8973ad49f47 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Tue, 24 Mar 2009 20:27:39 +0100 Subject: [PATCH] --- yaml --- r: 142763 b: refs/heads/master c: 3a38148f0488069cadb75c4a6909954072d648bf h: refs/heads/master i: 142761: f7edbb70a19f30a97a90fbb0272a6aceb9109d15 142759: b9246b321eb9a0bafce2d331c697998155be97c1 v: v3 --- [refs] | 2 +- trunk/include/linux/interrupt.h | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index d6837bac6574..afa69bfaacc5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f48fe81e5b032914183e9a17052313720c2cac56 +refs/heads/master: 3a38148f0488069cadb75c4a6909954072d648bf diff --git a/trunk/include/linux/interrupt.h b/trunk/include/linux/interrupt.h index 266a5f5f57cc..7e63b824833f 100644 --- a/trunk/include/linux/interrupt.h +++ b/trunk/include/linux/interrupt.h @@ -103,6 +103,7 @@ struct irqaction { extern irqreturn_t no_action(int cpl, void *dev_id); +#ifdef CONFIG_GENERIC_HARDIRQS extern int __must_check request_threaded_irq(unsigned int irq, irq_handler_t handler, irq_handler_t thread_fn, @@ -115,9 +116,13 @@ request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, return request_threaded_irq(irq, handler, NULL, flags, name, dev); } -#ifdef CONFIG_GENERIC_HARDIRQS extern void exit_irq_thread(void); #else + +extern int __must_check +request_irq(unsigned int irq, irq_handler_t handler, unsigned long flags, + const char *name, void *dev); + static inline void exit_irq_thread(void) { } #endif