]> git.hungrycats.org Git - linux/commitdiff
Revert bogus IRQ_INPROGRESS clear.
authorLinus Torvalds <torvalds@home.osdl.org>
Wed, 22 Oct 2003 13:26:38 +0000 (06:26 -0700)
committerLinus Torvalds <torvalds@home.osdl.org>
Wed, 22 Oct 2003 13:26:38 +0000 (06:26 -0700)
It's incorrect for any user of the non-synchronizing irq_disable_nosync().

Cset exclude: torvalds@home.osdl.org|ChangeSet|20031013020955|28777

arch/i386/kernel/irq.c

index 1525cf779ecf1bb8b62644c6ec76c28efb039473..ec718b194847e50731667856e543ce1c8e9bd161 100644 (file)
@@ -380,7 +380,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;