____call_usermodehelper: don't flush_signals()

[powerpc.git] / kernel / irq / resend.c

diff --git a/kernel/irq/resend.c b/kernel/irq/resend.c
index 096b102..5bfeaed 100644 (file)
--- a/kernel/irq/resend.c
+++ b/kernel/irq/resend.c
@@ -37,9 +37,9 @@ static void resend_irqs(unsigned long arg)
                irq = find_first_bit(irqs_resend, NR_IRQS);
                clear_bit(irq, irqs_resend);
                desc = irq_desc + irq;
-               spin_lock_irqsave(&desc->lock, flags);
-               desc->handle_irq(irq, desc, NULL);
-               spin_unlock_irqrestore(&desc->lock, flags);
+               local_irq_disable();
+               desc->handle_irq(irq, desc);
+               local_irq_enable();
        }
 }
 
@@ -63,8 +63,7 @@ void check_irq_resend(struct irq_desc *desc, unsigned int irq)
        desc->chip->enable(irq);
 
        if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
-               desc->status &= ~IRQ_PENDING;
-               desc->status = status | IRQ_REPLAY;
+               desc->status = (status & ~IRQ_PENDING) | IRQ_REPLAY;
 
                if (!desc->chip || !desc->chip->retrigger ||
                                        !desc->chip->retrigger(irq)) {