ia64: Sync with Linus' i386 patch: Revert bogus IRQ_INPROGRESS clear.

diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 163544a6b90347a97aa46d75fe906bf99e3730e1..471bb733efbcde4753ad8c9136d8743a6bb84982 100644 (file)
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -405,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 | IRQ_INPROGRESS);
+               unsigned int status = desc->status & ~IRQ_DISABLED;
                desc->status = status;
                if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
                        desc->status = status | IRQ_REPLAY;