mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-02 07:04:24 +00:00
vtime, sched/cputime: Remove vtime_account_user()
It's an unnecessary function between vtime_user_exit() and account_user_time(). Tested-by: Luiz Capitulino <lcapitulino@redhat.com> Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com> Reviewed-by: Thomas Gleixner <tglx@linutronix.de> Acked-by: Rik van Riel <riel@redhat.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Wanpeng Li <kernellwp@gmail.com> Link: http://lkml.kernel.org/r/1498756511-11714-2-git-send-email-fweisbec@gmail.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
3b9c08ae3d
commit
1c3eda01a7
2 changed files with 10 additions and 17 deletions
|
@ -67,19 +67,12 @@ static inline void vtime_account_system(struct task_struct *tsk) { }
|
||||||
|
|
||||||
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
|
#ifdef CONFIG_VIRT_CPU_ACCOUNTING_GEN
|
||||||
extern void arch_vtime_task_switch(struct task_struct *tsk);
|
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);
|
extern void vtime_user_enter(struct task_struct *tsk);
|
||||||
|
extern void vtime_user_exit(struct task_struct *tsk);
|
||||||
static inline void vtime_user_exit(struct task_struct *tsk)
|
|
||||||
{
|
|
||||||
vtime_account_user(tsk);
|
|
||||||
}
|
|
||||||
|
|
||||||
extern void vtime_guest_enter(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_guest_exit(struct task_struct *tsk);
|
||||||
extern void vtime_init_idle(struct task_struct *tsk, int cpu);
|
extern void vtime_init_idle(struct task_struct *tsk, int cpu);
|
||||||
#else /* !CONFIG_VIRT_CPU_ACCOUNTING_GEN */
|
#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_enter(struct task_struct *tsk) { }
|
||||||
static inline void vtime_user_exit(struct task_struct *tsk) { }
|
static inline void vtime_user_exit(struct task_struct *tsk) { }
|
||||||
static inline void vtime_guest_enter(struct task_struct *tsk) { }
|
static inline void vtime_guest_enter(struct task_struct *tsk) { }
|
||||||
|
|
|
@ -724,15 +724,6 @@ void vtime_account_system(struct task_struct *tsk)
|
||||||
write_seqcount_end(&tsk->vtime_seqcount);
|
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)
|
void vtime_user_enter(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
write_seqcount_begin(&tsk->vtime_seqcount);
|
write_seqcount_begin(&tsk->vtime_seqcount);
|
||||||
|
@ -742,6 +733,15 @@ void vtime_user_enter(struct task_struct *tsk)
|
||||||
write_seqcount_end(&tsk->vtime_seqcount);
|
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)
|
void vtime_guest_enter(struct task_struct *tsk)
|
||||||
{
|
{
|
||||||
/*
|
/*
|
||||||
|
|
Loading…
Reference in a new issue