Auto-update from upstream

[linux-2.6] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 31007d6542cccbf6c4df2607a848802d13b5fd63..f766b2fc48be8cd54cc254c91660ec414603a2c5 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -84,9 +84,9 @@ asmlinkage void __do_softirq(void)
        cpu = smp_processor_id();
 restart:
        /* Reset the pending bitmask before enabling irqs */
-       local_softirq_pending() = 0;
+       set_softirq_pending(0);
 
-       //local_irq_enable();
+       local_irq_enable();
 
        h = softirq_vec;
 
@@ -99,7 +99,7 @@ restart:
                pending >>= 1;
        } while (pending);
 
-       //local_irq_disable();
+       local_irq_disable();
 
        pending = local_softirq_pending();
        if (pending && --max_restart)