path: root/kernel
diff options
authorAndrew Morton <akpm@linux-foundation.org>2007-08-22 14:01:20 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-08-22 19:52:44 -0700
commit8b7f07155f8ee1536da2f9590f1aa9383afefb6b (patch)
treed4f0fcf4a96734c33ed9e0470fcb28be523070a0 /kernel
parent436bbd431d41e0fd3bfedb0312ab764b291ddf82 (diff)
free_irq(): fix DEBUG_SHIRQ handling
If we're going to run the handler from free_irq() then we must do it with local irq's disabled. Otherwise lockdep complains that the handler is taking irq-safe spinlocks in a non-irq-safe fashion. Cc: Ingo Molnar <mingo@elte.hu> Cc: David Woodhouse <dwmw2@infradead.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel')
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index 203a518b6f1..853aefbd184 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -462,7 +462,9 @@ void free_irq(unsigned int irq, void *dev_id)
* We do this after actually deregistering it, to make sure that
* a 'real' IRQ doesn't run in parallel with our fake
+ local_irq_save(flags);
handler(irq, dev_id);
+ local_irq_restore(flags);