Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 27ea0f78 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 2ef176f1 64be38ab

kernel/irq/irqdomain.c

+1 −0
Original line number Diff line number Diff line
@@ -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>

kernel/irq/manage.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

}