Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6

[~andy/linux] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index cc96bdc0c2c99ff55c6a428368eacaccc2fac3d2..ed567babe789c10ef48a2db7b63e17e0a2192d65 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -221,7 +221,7 @@ asmlinkage void __do_softirq(void)
        current->flags &= ~PF_MEMALLOC;
 
        pending = local_softirq_pending();
-       vtime_account(current);
+       vtime_account_irq_enter(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0),
                                SOFTIRQ_OFFSET);
@@ -272,7 +272,7 @@ restart:
 
        lockdep_softirq_exit();
 
-       vtime_account(current);
+       vtime_account_irq_exit(current);
        __local_bh_enable(SOFTIRQ_OFFSET);
        tsk_restore_flags(current, old_flags, PF_MEMALLOC);
 }
@@ -341,7 +341,7 @@ static inline void invoke_softirq(void)
  */
 void irq_exit(void)
 {
-       vtime_account(current);
+       vtime_account_irq_exit(current);
        trace_hardirq_exit();
        sub_preempt_count(IRQ_EXIT_OFFSET);
        if (!in_interrupt() && local_softirq_pending())