Merge git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc

[pandora-kernel.git] / arch / powerpc / kernel / irq.c

diff --git a/arch/powerpc/kernel/irq.c b/arch/powerpc/kernel/irq.c
index 05a7009..8cf9878 100644 (file)
--- a/arch/powerpc/kernel/irq.c
+++ b/arch/powerpc/kernel/irq.c
@@ -306,13 +306,8 @@ void do_softirq(void)
 
        local_irq_save(flags);
 
-       if (local_softirq_pending()) {
-               account_system_vtime(current);
-               local_bh_disable();
+       if (local_softirq_pending())
                do_softirq_onstack();
-               account_system_vtime(current);
-               __local_bh_enable();
-       }
 
        local_irq_restore(flags);
 }