Merge branch 'drm-intel-fixes' of git://people.freedesktop.org/~danvet/drm-intel...

[firefly-linux-kernel-4.4.55.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 5c6a5bd8462fb33fa8737d0ba1b6dbd7e2144dec..cc96bdc0c2c99ff55c6a428368eacaccc2fac3d2 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();
-       account_system_vtime(current);
+       vtime_account(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0),
                                SOFTIRQ_OFFSET);
@@ -272,7 +272,7 @@ restart:
 
        lockdep_softirq_exit();
 
-       account_system_vtime(current);
+       vtime_account(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)
 {
-       account_system_vtime(current);
+       vtime_account(current);
        trace_hardirq_exit();
        sub_preempt_count(IRQ_EXIT_OFFSET);
        if (!in_interrupt() && local_softirq_pending())