genirq fixes for 2.6.31 -V2
Linus,
Please pull the latest irq-fixes-for-linus-2 git tree from:
git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git irq-fixes-for-linus-2
Thanks for pointing out the obvious solution.
I hope it's ok for you that I precautionary added your Signed-off-by to the commit.
Thanks,
tglx
------------------>
Linus Torvalds (1):
genirq: prevent wakeup of freed irq thread
kernel/irq/manage.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-)
kernel/irq/manage.c +7 -10
@@ -761,7 +761,6 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) {struct irq_desc *desc =irq_to_desc (irq);struct irqaction *action, **action_ptr; -struct task_struct *irqthread;unsigned long flags;WARN (in_interrupt (),"Trying to free IRQ %d from IRQ context!\n" , irq);
@@ -809,9 +808,6 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) desc->chip->disable (irq); } - irqthread = action->thread; - action->thread =NULL ; -spin_unlock_irqrestore (&desc->lock, flags);unregister_handler_proc (irq, action);
@@ -819,12 +815,6 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id)/* Make sure it's not being used on another CPU: */ synchronize_irq (irq); -if (irqthread) { -if (!test_bit (IRQTF_DIED , &action->thread_flags)) -kthread_stop (irqthread); -put_task_struct (irqthread); - } -#ifdef CONFIG_DEBUG_SHIRQ /* * It's a shared IRQ -- the driver ought to be prepared for an IRQ
@@ -840,6 +830,13 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) local_irq_restore(flags); }#endif + +if (action->thread) { +if (!test_bit (IRQTF_DIED , &action->thread_flags)) +kthread_stop (action->thread); +put_task_struct (action->thread); + } +return action; }