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

Commit dcd94dbd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'irq-fixes-for-linus' of... 

Merge branch 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'irq-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  genirq: Wake up irq thread after action has been installed
parents 8486a0f9 69ab8494

kernel/irq/manage.c

+8 −2
Original line number Diff line number Diff line
@@ -607,7 +607,6 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
		 */

		get_task_struct(t);

		new->thread = t;

		wake_up_process(t);

	}



	/*
@@ -690,6 +689,7 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 
				(int)(new->flags & IRQF_TRIGGER_MASK));

	}



	new->irq = irq;

	*old_ptr = new;



	/* Reset broken irq detection when installing new handler */
@@ -707,7 +707,13 @@ __setup_irq(unsigned int irq, struct irq_desc *desc, struct irqaction *new) 


	spin_unlock_irqrestore(&desc->lock, flags);



	new->irq = irq;

	/*

	 * Strictly no need to wake it up, but hung_task complains

	 * when no hard interrupt wakes the thread up.

	 */

	if (new->thread)

		wake_up_process(new->thread);



	register_irq_proc(irq, desc);

	new->dir = NULL;

	register_handler_proc(irq, new);