diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 16:31:41 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-07 16:31:41 -0800 |
| commit | 27ea0f781198a9c594b036abf406b65a4705d5f2 (patch) | |
| tree | 8f0face03e98b8b99d0286db4dac842ea117743f /kernel | |
| parent | 2ef176f11a40d21e8d6c5d98a3c09d57c861fac6 (diff) | |
| parent | 64be38ab03e9b238a1299857fef8b3707c0ed045 (diff) | |
| download | linux-27ea0f781198a9c594b036abf406b65a4705d5f2.tar.bz2 | |
Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull irq fixes from Thomas Gleixner:
- a bugfix for a long standing waitqueue race
- a trivial fix for a missing include
* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
genirq: Include missing header file in irqdomain.c
genirq: Remove racy waitqueue_active check
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/irq/irqdomain.c | 1 | ||||
| -rw-r--r-- | kernel/irq/manage.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index cf68bb36fe58..f14033700c25 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -10,6 +10,7 @@ #include <linux/mutex.h> #include <linux/of.h> #include <linux/of_address.h> +#include <linux/of_irq.h> #include <linux/topology.h> #include <linux/seq_file.h> #include <linux/slab.h> diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c index 481a13c43b17..d3bf660cb57f 100644 --- a/kernel/irq/manage.c +++ b/kernel/irq/manage.c @@ -802,8 +802,7 @@ static irqreturn_t irq_thread_fn(struct irq_desc *desc, static void wake_threads_waitq(struct irq_desc *desc) { - if (atomic_dec_and_test(&desc->threads_active) && - waitqueue_active(&desc->wait_for_threads)) + if (atomic_dec_and_test(&desc->threads_active)) wake_up(&desc->wait_for_threads); } |