[PATCH 21/36] sched: Remove temporary cputime_t accessors

[Frederic Weisbecker]

Now that the whole cputime conversion to nsec units is complete, we
can remove the compatibility accessors.

Cc: Benjamin Herrenschmidt <b...@kernel.crashing.org>
Cc: Paul Mackerras <pau...@samba.org>
Cc: Michael Ellerman <m...@ellerman.id.au>
Cc: Heiko Carstens <heiko.carst...@de.ibm.com>
Cc: Martin Schwidefsky <schwidef...@de.ibm.com>
Cc: Tony Luck <tony.l...@intel.com>
Cc: Fenghua Yu <fenghua...@intel.com>
Cc: Peter Zijlstra <pet...@infradead.org>
Cc: Rik van Riel <r...@redhat.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Ingo Molnar <mi...@kernel.org>
Cc: Stanislaw Gruszka <sgrus...@redhat.com>
Cc: Wanpeng Li <wanpeng...@hotmail.com>
Signed-off-by: Frederic Weisbecker <fweis...@gmail.com>
---
 include/linux/sched.h | 40 ----------------------------------------
 1 file changed, 40 deletions(-)

diff --git a/include/linux/sched.h b/include/linux/sched.h
index a5081ff..5541090 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>
@@ -611,13 +610,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
@@ -2273,27 +2265,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);
 
@@ -3498,17 +3469,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, &times);
-       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.
-- 
2.7.4