diff options
-rw-r--r-- | kernel/sched/cputime.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index bb6b29a3067c..5f273b477764 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c | |||
@@ -664,9 +664,6 @@ static void __vtime_account_system(struct task_struct *tsk) | |||
664 | 664 | ||
665 | void vtime_account_system(struct task_struct *tsk) | 665 | void vtime_account_system(struct task_struct *tsk) |
666 | { | 666 | { |
667 | if (!vtime_accounting_enabled()) | ||
668 | return; | ||
669 | |||
670 | write_seqlock(&tsk->vtime_seqlock); | 667 | write_seqlock(&tsk->vtime_seqlock); |
671 | __vtime_account_system(tsk); | 668 | __vtime_account_system(tsk); |
672 | write_sequnlock(&tsk->vtime_seqlock); | 669 | write_sequnlock(&tsk->vtime_seqlock); |
@@ -686,12 +683,7 @@ void vtime_account_irq_exit(struct task_struct *tsk) | |||
686 | 683 | ||
687 | void vtime_account_user(struct task_struct *tsk) | 684 | void vtime_account_user(struct task_struct *tsk) |
688 | { | 685 | { |
689 | cputime_t delta_cpu; | 686 | cputime_t delta_cpu = get_vtime_delta(tsk); |
690 | |||
691 | if (!vtime_accounting_enabled()) | ||
692 | return; | ||
693 | |||
694 | delta_cpu = get_vtime_delta(tsk); | ||
695 | 687 | ||
696 | write_seqlock(&tsk->vtime_seqlock); | 688 | write_seqlock(&tsk->vtime_seqlock); |
697 | tsk->vtime_snap_whence = VTIME_SYS; | 689 | tsk->vtime_snap_whence = VTIME_SYS; |
@@ -701,9 +693,6 @@ void vtime_account_user(struct task_struct *tsk) | |||
701 | 693 | ||
702 | void vtime_user_enter(struct task_struct *tsk) | 694 | void vtime_user_enter(struct task_struct *tsk) |
703 | { | 695 | { |
704 | if (!vtime_accounting_enabled()) | ||
705 | return; | ||
706 | |||
707 | write_seqlock(&tsk->vtime_seqlock); | 696 | write_seqlock(&tsk->vtime_seqlock); |
708 | tsk->vtime_snap_whence = VTIME_USER; | 697 | tsk->vtime_snap_whence = VTIME_USER; |
709 | __vtime_account_system(tsk); | 698 | __vtime_account_system(tsk); |