diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 19:42:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-26 19:42:08 -0800 |
| commit | 0685ab4fb8e527639d9867df60d49dccba85d842 (patch) | |
| tree | 7d7db22548b95da9555afec2889a9e8efa2053d9 /fs | |
| parent | ff1ea52fa317a5658b6415b25169c5e531f54876 (diff) | |
| parent | f7b9329e556a8bdb9e07292cddbbe484c7a2b8c5 (diff) | |
| download | linux-0685ab4fb8e527639d9867df60d49dccba85d842.tar.gz linux-0685ab4fb8e527639d9867df60d49dccba85d842.tar.bz2 linux-0685ab4fb8e527639d9867df60d49dccba85d842.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: bump version of kernel/sched_debug.c
sched: fix minimum granularity tunings
sched: fix RLIMIT_CPU comment
sched: fix kernel/acct.c comment
sched: fix prev_stime calculation
sched: don't forget to unlock uids_mutex on error paths
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/array.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index eba339ecba27..65c62e1bfd6f 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -374,7 +374,9 @@ 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)); - p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime)); + if (stime >= 0) + p->prev_stime = max(p->prev_stime, clock_t_to_cputime(stime)); + return p->prev_stime; } #endif |