diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 21:06:19 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-29 21:06:19 (GMT) |
| commit | db8185360d91c01f6e482db5ee402c0ad90dec52 (patch) | |
| tree | 5195407be8483cd9ae206a7877d60ebb886112bd /fs | |
| parent | 6a22c57b8d2a62dea7280a6b2ac807a539ef0716 (diff) | |
| parent | 38605cae99d386332df6822a22dba7bfdc8fae1c (diff) | |
| download | linux-db8185360d91c01f6e482db5ee402c0ad90dec52.tar.xz | |
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: fix style in kernel/sched.c
sched: fix style of swap() macro in kernel/sched_fair.c
sched: report CPU usage in CFS cgroup directories
sched: move rcu_head to task_group struct
sched: fix incorrect assumption that cpu 0 exists
sched: keep utime/stime monotonic
sched: make kernel/sched.c:account_guest_time() static
Diffstat (limited to 'fs')
| -rw-r--r-- | fs/proc/array.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c index 63c95af..d80baaa 100644 --- a/fs/proc/array.c +++ b/fs/proc/array.c @@ -358,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) |