Commit-ID: 71ea47b197de9a53bc3747a8b1c667df9c6a4c68 Gitweb: http://git.kernel.org/tip/71ea47b197de9a53bc3747a8b1c667df9c6a4c68 Author: Frederic Weisbecker <[email protected]> AuthorDate: Tue, 31 Jan 2017 04:09:36 +0100 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 1 Feb 2017 09:13:55 +0100
sched/cputime: Remove temporary cputime_t accessors Now that the whole cputime conversion to nsec units is complete, we can remove the compatibility accessors. Signed-off-by: Frederic Weisbecker <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Fenghua Yu <[email protected]> Cc: Heiko Carstens <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Martin Schwidefsky <[email protected]> Cc: Michael Ellerman <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Stanislaw Gruszka <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Tony Luck <[email protected]> Cc: Wanpeng Li <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- include/linux/sched.h | 40 ---------------------------------------- 1 file changed, 40 deletions(-) diff --git a/include/linux/sched.h b/include/linux/sched.h index 268fdd7..d176454 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -29,7 +29,6 @@ struct sched_param { #include <asm/page.h> #include <asm/ptrace.h> -#include <linux/cputime.h> #include <linux/smp.h> #include <linux/sem.h> @@ -613,13 +612,6 @@ struct task_cputime { unsigned long long sum_exec_runtime; }; -/* Temporary type to ease cputime_t to nsecs conversion */ -struct task_cputime_t { - cputime_t utime; - cputime_t stime; - unsigned long long sum_exec_runtime; -}; - /* Alternate field names when used to cache expirations. */ #define virt_exp utime #define prof_exp stime @@ -2291,27 +2283,6 @@ static inline void task_cputime_scaled(struct task_struct *t, } #endif -static inline void task_cputime_t(struct task_struct *t, - cputime_t *utime, cputime_t *stime) -{ - u64 ut, st; - - task_cputime(t, &ut, &st); - *utime = nsecs_to_cputime(ut); - *stime = nsecs_to_cputime(st); -} - -static inline void task_cputime_t_scaled(struct task_struct *t, - cputime_t *utimescaled, - cputime_t *stimescaled) -{ - u64 ut, st; - - task_cputime_scaled(t, &ut, &st); - *utimescaled = nsecs_to_cputime(ut); - *stimescaled = nsecs_to_cputime(st); -} - extern void task_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st); extern void thread_group_cputime_adjusted(struct task_struct *p, u64 *ut, u64 *st); @@ -3527,17 +3498,6 @@ static __always_inline bool need_resched(void) void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times); void thread_group_cputimer(struct task_struct *tsk, struct task_cputime *times); -static inline void thread_group_cputime_t(struct task_struct *tsk, - struct task_cputime_t *cputime) -{ - struct task_cputime times; - - thread_group_cputime(tsk, ×); - cputime->utime = nsecs_to_cputime(times.utime); - cputime->stime = nsecs_to_cputime(times.stime); - cputime->sum_exec_runtime = times.sum_exec_runtime; -} - /* * Reevaluate whether the task has signals pending delivery. * Wake the task if so.
