projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
sched: keep utime/stime monotonic
[linux-2.6-block.git]
/
fs
/
proc
/
array.c
diff --git
a/fs/proc/array.c
b/fs/proc/array.c
index 63c95afb561f8e8742118197b0731317ea871463..d80baaabf835e1c98911004035518bf5df7dc51d 100644
(file)
--- 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)