Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c3eda01 authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar
Browse files

vtime, sched/cputime: Remove vtime_account_user() 



It's an unnecessary function between vtime_user_exit() and
account_user_time().

Tested-by: default avatarLuiz Capitulino <lcapitulino@redhat.com>
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Reviewed-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarRik 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: default avatarIngo Molnar <mingo@kernel.org>
parent 3b9c08ae

include/linux/vtime.h

+1 −8
Original line number Diff line number Diff line
@@ -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) { }

kernel/sched/cputime.c

+6 −6
Original line number Diff line number Diff line
@@ -724,21 +724,21 @@ void vtime_account_system(struct task_struct *tsk) 
	write_seqcount_end(&tsk->vtime_seqcount);

}



void vtime_account_user(struct task_struct *tsk)

void vtime_user_enter(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));

		__vtime_account_system(tsk);

	tsk->vtime_snap_whence = VTIME_USER;

	write_seqcount_end(&tsk->vtime_seqcount);

}



void vtime_user_enter(struct task_struct *tsk)

void vtime_user_exit(struct task_struct *tsk)

{

	write_seqcount_begin(&tsk->vtime_seqcount);

	tsk->vtime_snap_whence = VTIME_SYS;

	if (vtime_delta(tsk))

		__vtime_account_system(tsk);

	tsk->vtime_snap_whence = VTIME_USER;

		account_user_time(tsk, get_vtime_delta(tsk));

	write_seqcount_end(&tsk->vtime_seqcount);

}