---

yaml --- r: 72811 b: refs/heads/master c: 4282b01 h: refs/heads/master i: 72809: bc765c8 72807: aa08a00 v: v3
git-mirror · Oct 30, 2007 · 270fc3e · 270fc3e
1 parent b010054
commit 270fc3e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aa69432a68fb0aec49551fd69fe920a6df572573
+refs/heads/master: 4282b01e0075ac4495ab2e1cd012cbc43e764c51
diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c
@@ -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
 

diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h
@@ -1009,7 +1009,7 @@ struct task_struct {
 	unsigned int rt_priority;
 	cputime_t utime, stime, utimescaled, stimescaled;
 	cputime_t gtime;
-	cputime_t prev_utime;
+	cputime_t prev_utime, prev_stime;
 	unsigned long nvcsw, nivcsw; /* context switch counts */
 	struct timespec start_time; 		/* monotonic time */
 	struct timespec real_start_time;	/* boot based time */

diff --git a/trunk/kernel/fork.c b/trunk/kernel/fork.c
@@ -1057,6 +1057,7 @@ static struct task_struct *copy_process(unsigned long clone_flags,
 	p->utimescaled = cputime_zero;
 	p->stimescaled = cputime_zero;
 	p->prev_utime = cputime_zero;
+	p->prev_stime = cputime_zero;
 
 #ifdef CONFIG_TASK_XACCT
 	p->rchar = 0;		/* I/O counter: bytes read */