Commit 8c809d95 authored by David Mosberger's avatar David Mosberger

ia64: Sync with i386 irq.c (deadlock avoidance for certain disable_irq()/

	enable_irq() sequences).
parent 48711f91
......@@ -379,8 +379,11 @@ inline void disable_irq_nosync(unsigned int irq)
void disable_irq(unsigned int irq)
{
irq_desc_t *desc = irq_descp(irq);
disable_irq_nosync(irq);
synchronize_irq(irq);
if (desc->action)
synchronize_irq(irq);
}
/**
......@@ -402,7 +405,7 @@ void enable_irq(unsigned int irq)
spin_lock_irqsave(&desc->lock, flags);
switch (desc->depth) {
case 1: {
unsigned int status = desc->status & ~IRQ_DISABLED;
unsigned int status = desc->status & ~(IRQ_DISABLED | IRQ_INPROGRESS);
desc->status = status;
if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
desc->status = status | IRQ_REPLAY;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment