sched: fix /proc/<PID>/stat stime/utime monotonicity, part 2

[pandora-kernel.git] / fs / proc / array.c

diff --git a/fs/proc/array.c b/fs/proc/array.c
index 04b689f..eba339e 100644 (file)
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -146,8 +146,7 @@ static inline const char *get_task_state(struct task_struct *tsk)
                                            TASK_UNINTERRUPTIBLE |
                                            TASK_STOPPED |
                                            TASK_TRACED)) |
-                       (tsk->exit_state & (EXIT_ZOMBIE |
-                                           EXIT_DEAD));
+                                          tsk->exit_state;
        const char **p = &task_state_array[0];
 
        while (state) {
@@ -359,7 +358,8 @@ static cputime_t task_utime(struct task_struct *p)
        }
        utime = (clock_t)temp;
 
-       return clock_t_to_cputime(utime);
+       p->prev_utime = max(p->prev_utime, clock_t_to_cputime(utime));
+       return p->prev_utime;
 }
 
 static cputime_t task_stime(struct task_struct *p)
@@ -374,7 +374,8 @@ static cputime_t task_stime(struct task_struct *p)
        stime = nsec_to_clock_t(p->se.sum_exec_runtime) -
                        cputime_to_clock_t(task_utime(p));
 
-       return clock_t_to_cputime(stime);
+       p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime));
+       return p->prev_stime;
 }
 #endif
 
@@ -457,7 +458,7 @@ static int do_task_stat(struct task_struct *task, char *buffer, int whole)
                        maj_flt += sig->maj_flt;
                        utime = cputime_add(utime, sig->utime);
                        stime = cputime_add(stime, sig->stime);
-                       gtime += cputime_add(gtime, sig->gtime);
+                       gtime = cputime_add(gtime, sig->gtime);
                }
 
                sid = task_session_nr_ns(task, ns);