| Message ID | 1253731843-1045-1-git-send-email-hauke@hauke-m.de (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
On Wed, Sep 23, 2009 at 11:50 AM, Hauke Mehrtens <hauke@hauke-m.de> wrote: > IRQ_WAKE_THREAD is not defined in kernel < 2.6.30 > in include/linux/irqreturn.h . > > In 09-threaded-irq.patch the condition was wrong. Applied, thanks. Luis -- To unsubscribe from this list: send the line "unsubscribe linux-wireless" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/compat/compat-2.6.30.h b/compat/compat-2.6.30.h index 6a7c8fb..ed31198 100644 --- a/compat/compat-2.6.30.h +++ b/compat/compat-2.6.30.h @@ -14,6 +14,8 @@ #define TP_ARGS(args...) TPARGS(args) #endif +#define IRQ_WAKE_THREAD (2) + #endif /* (LINUX_VERSION_CODE < KERNEL_VERSION(2,6,30)) */ #endif /* LINUX_26_30_COMPAT_H */ diff --git a/compat/patches/09-threaded-irq.patch b/compat/patches/09-threaded-irq.patch index e6daa15..4b9a361 100644 --- a/compat/patches/09-threaded-irq.patch +++ b/compat/patches/09-threaded-irq.patch @@ -25,15 +25,15 @@ thread in process context as well. } } else { +#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,31) - err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler, - b43_interrupt_thread_handler, - IRQF_SHARED, KBUILD_MODNAME, dev); -+#else + err = compat_request_threaded_irq(&dev->irq_compat, + dev->dev->irq, + b43_interrupt_handler, + b43_interrupt_thread_handler, + IRQF_SHARED, KBUILD_MODNAME, dev); ++#else + err = request_threaded_irq(dev->dev->irq, b43_interrupt_handler, + b43_interrupt_thread_handler, + IRQF_SHARED, KBUILD_MODNAME, dev); +#endif if (err) { b43err(dev->wl, "Cannot request IRQ-%d\n", dev->dev->irq);
IRQ_WAKE_THREAD is not defined in kernel < 2.6.30 in include/linux/irqreturn.h . In 09-threaded-irq.patch the condition was wrong. Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de> --- compat/compat-2.6.30.h | 2 ++ compat/patches/09-threaded-irq.patch | 8 ++++---- 2 files changed, 6 insertions(+), 4 deletions(-)