Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753326AbdF2RQF (ORCPT ); Thu, 29 Jun 2017 13:16:05 -0400 Received: from mail-wm0-f65.google.com ([74.125.82.65]:33656 "EHLO mail-wm0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752384AbdF2RPU (ORCPT ); Thu, 29 Jun 2017 13:15:20 -0400 From: Frederic Weisbecker To: LKML Cc: Frederic Weisbecker , Peter Zijlstra , Thomas Gleixner , Luiz Capitulino , Ingo Molnar , Wanpeng Li , Rik van Riel Subject: [PATCH 1/5] vtime: Remove vtime_account_user() Date: Thu, 29 Jun 2017 19:15:07 +0200 Message-Id: <1498756511-11714-2-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1498756511-11714-1-git-send-email-fweisbec@gmail.com> References: <1498756511-11714-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2675 Lines: 78 It's an unnecessary function between vtime_user_exit() and account_user_time(). Cc: Wanpeng Li Cc: Rik van Riel Cc: Peter Zijlstra Cc: Thomas Gleixner Cc: Ingo Molnar Cc: Luiz Capitulino Signed-off-by: Frederic Weisbecker --- include/linux/vtime.h | 9 +-------- kernel/sched/cputime.c | 18 +++++++++--------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/include/linux/vtime.h b/include/linux/vtime.h index 0681fe2..18b405e 100644 --- a/include/linux/vtime.h +++ b/include/linux/vtime.h @@ -67,19 +67,12 @@ static inline void vtime_account_system(struct task_struct *tsk) { } #ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN extern void arch_vtime_task_switch(struct task_struct *tsk); -extern void vtime_account_user(struct task_struct *tsk); extern void vtime_user_enter(struct task_struct *tsk); - -static inline void vtime_user_exit(struct task_struct *tsk) -{ - vtime_account_user(tsk); -} - +extern void vtime_user_exit(struct task_struct *tsk); extern void vtime_guest_enter(struct task_struct *tsk); extern void vtime_guest_exit(struct task_struct *tsk); extern void vtime_init_idle(struct task_struct *tsk, int cpu); #else /* !CONFIG_VIRT_CPU_ACCOUNTING_GEN */ -static inline void vtime_account_user(struct task_struct *tsk) { } static inline void vtime_user_enter(struct task_struct *tsk) { } static inline void vtime_user_exit(struct task_struct *tsk) { } static inline void vtime_guest_enter(struct task_struct *tsk) { } diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index aea3135..5e080ca 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -724,15 +724,6 @@ void vtime_account_system(struct task_struct *tsk) write_seqcount_end(&tsk->vtime_seqcount); } -void vtime_account_user(struct task_struct *tsk) -{ - write_seqcount_begin(&tsk->vtime_seqcount); - tsk->vtime_snap_whence = VTIME_SYS; - if (vtime_delta(tsk)) - account_user_time(tsk, get_vtime_delta(tsk)); - write_seqcount_end(&tsk->vtime_seqcount); -} - void vtime_user_enter(struct task_struct *tsk) { write_seqcount_begin(&tsk->vtime_seqcount); @@ -742,6 +733,15 @@ void vtime_user_enter(struct task_struct *tsk) write_seqcount_end(&tsk->vtime_seqcount); } +void vtime_user_exit(struct task_struct *tsk) +{ + write_seqcount_begin(&tsk->vtime_seqcount); + tsk->vtime_snap_whence = VTIME_SYS; + if (vtime_delta(tsk)) + account_user_time(tsk, get_vtime_delta(tsk)); + write_seqcount_end(&tsk->vtime_seqcount); +} + void vtime_guest_enter(struct task_struct *tsk) { /* -- 2.7.4