sched: Remove task_{u,s,g}time()

Now all task_{u,s}time() pairs are replaced by task_times().
And task_gtime() is too simple to be an inline function.

Cleanup them all.

Signed-off-by: Hidetoshi Seto <[email protected]>
Acked-by: Peter Zijlstra <[email protected]>
Cc: Stanislaw Gruszka <[email protected]>
Cc: Spencer Candland <[email protected]>
Cc: Oleg Nesterov <[email protected]>
Cc: Balbir Singh <[email protected]>
Cc: Americo Wang <[email protected]>
LKML-Reference: <4B0E16D1[email protected]>
Signed-off-by: Ingo Molnar <[email protected]>

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 330deda70d08c4c65623428c84c2fc1896a68d8a..ca61a88aed663bc6b6fed8d7c94e270140d68f3c 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -511,7 +511,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                        do {
                                min_flt += t->min_flt;
                                maj_flt += t->maj_flt;
-                               gtime = cputime_add(gtime, task_gtime(t));
+                               gtime = cputime_add(gtime, t->gtime);
                                t = next_thread(t);
                        } while (t != task);
 
@@ -536,7 +536,7 @@ static int do_task_stat(struct seq_file *m, struct pid_namespace *ns,
                min_flt = task->min_flt;
                maj_flt = task->maj_flt;
                task_times(task, &utime, &stime);
-               gtime = task_gtime(task);
+               gtime = task->gtime;
        }
 
        /* scale priority and nice values from timeslices to -20..20 */

diff --git a/include/linux/sched.h b/include/linux/sched.h
index fe6ae1516640923286643a02f6fbd3ad4076dd79..0395b0f4df3ae7bf973ca54e9eefc775b429e658 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1720,9 +1720,6 @@ static inline void put_task_struct(struct task_struct *t)
                __put_task_struct(t);
 }
 
-extern cputime_t task_utime(struct task_struct *p);
-extern cputime_t task_stime(struct task_struct *p);
-extern cputime_t task_gtime(struct task_struct *p);
 extern void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st);
 
 /*

diff --git a/kernel/exit.c b/kernel/exit.c
index 29068ab2670a9baaa5950b4d9b0ad85d35b384ce..2eaf68b634e3b592726b5176188cc6186cbc6b27 100644 (file)
--- a/kernel/exit.c
+++ b/kernel/exit.c
@@ -115,7 +115,7 @@ static void __exit_signal(struct task_struct *tsk)
                task_times(tsk, &utime, &stime);
                sig->utime = cputime_add(sig->utime, utime);
                sig->stime = cputime_add(sig->stime, stime);
-               sig->gtime = cputime_add(sig->gtime, task_gtime(tsk));
+               sig->gtime = cputime_add(sig->gtime, tsk->gtime);
                sig->min_flt += tsk->min_flt;
                sig->maj_flt += tsk->maj_flt;
                sig->nvcsw += tsk->nvcsw;

diff --git a/kernel/sched.c b/kernel/sched.c
index 475a6f2b7158dedcaa97b2c10cb7624b67aa93cf..82251c21f785f07b97760261ae3cd06db5c90e2a 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -5182,22 +5182,12 @@ void account_idle_ticks(unsigned long ticks)
  * Use precise platform statistics if available:
  */
 #ifdef CONFIG_VIRT_CPU_ACCOUNTING
-cputime_t task_utime(struct task_struct *p)
-{
-       return p->utime;
-}
-
-cputime_t task_stime(struct task_struct *p)
-{
-       return p->stime;
-}
-
 void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
 {
        if (ut)
-               *ut = task_utime(p);
+               *ut = p->utime;
        if (st)
-               *st = task_stime(p);
+               *st = p->stime;
 }
 #else
 
@@ -5235,27 +5225,8 @@ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
        if (st)
                *st = p->prev_stime;
 }
-
-cputime_t task_utime(struct task_struct *p)
-{
-       cputime_t utime;
-       task_times(p, &utime, NULL);
-       return utime;
-}
-
-cputime_t task_stime(struct task_struct *p)
-{
-       cputime_t stime;
-       task_times(p, NULL, &stime);
-       return stime;
-}
 #endif
 
-inline cputime_t task_gtime(struct task_struct *p)
-{
-       return p->gtime;
-}
-
 /*
  * This function gets called by the timer code, with HZ frequency.
  * We call it with interrupts disabled.