From 270fc3e8f80a09037b446edf257c09e40fd4b7d3 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 29 Oct 2007 21:44:20 -0700 Subject: [PATCH] --- yaml --- r: 72811 b: refs/heads/master c: 4282b01e0075ac4495ab2e1cd012cbc43e764c51 h: refs/heads/master i: 72809: bc765c85b21c9518314ffe60a6d8c750e8e52750 72807: aa08a00ab4f174ebe40ff5cb329792d229bb80d5 v: v3 --- [refs] | 2 +- trunk/fs/proc/array.c | 3 ++- trunk/include/linux/sched.h | 2 +- trunk/kernel/fork.c | 1 + 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c6d8687be0f4..cfd78ba3e333 100644 --- 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 index d80baaabf835..eba339ecba27 100644 --- 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 index b0b1fe6e0b17..155d7438f7ad 100644 --- 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 index a65bfc47177c..28a740151988 100644 --- 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 */