Commit ea83ae2f 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 fix from Ingo Molnar:
 "Fixes a core IRQ subsystem deadlock"

* 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  genirq: Prevent chip buslock deadlock
parents a6a7358e abc7e40c

kernel/irq/manage.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -1434,6 +1434,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) 
	if (!desc)

	if (!desc)

		return NULL;

		return NULL;





	chip_bus_lock(desc);

	raw_spin_lock_irqsave(&desc->lock, flags);

	raw_spin_lock_irqsave(&desc->lock, flags);





	/*

	/*
@@ -1447,7 +1448,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) 
		if (!action) {

		if (!action) {

			WARN(1, "Trying to free already-free IRQ %d\n", irq);

			WARN(1, "Trying to free already-free IRQ %d\n", irq);

			raw_spin_unlock_irqrestore(&desc->lock, flags);

			raw_spin_unlock_irqrestore(&desc->lock, flags);



			chip_bus_sync_unlock(desc);

			return NULL;

			return NULL;

		}

		}
@@ -1475,6 +1476,7 @@ static struct irqaction *__free_irq(unsigned int irq, void *dev_id) 
#endif

#endif





	raw_spin_unlock_irqrestore(&desc->lock, flags);

	raw_spin_unlock_irqrestore(&desc->lock, flags);

	chip_bus_sync_unlock(desc);





	unregister_handler_proc(irq, action);

	unregister_handler_proc(irq, action);
@@ -1553,9 +1555,7 @@ void free_irq(unsigned int irq, void *dev_id) 
		desc->affinity_notify = NULL;

		desc->affinity_notify = NULL;

#endif

#endif





	chip_bus_lock(desc);

	kfree(__free_irq(irq, dev_id));

	kfree(__free_irq(irq, dev_id));

	chip_bus_sync_unlock(desc);

}

}

EXPORT_SYMBOL(free_irq);

EXPORT_SYMBOL(free_irq);