From e745527f7f854aef81f6098f241e4f9049b35f73 Mon Sep 17 00:00:00 2001 From: Peter Zijlstra Date: Mon, 29 Oct 2007 21:18:11 +0100 Subject: [PATCH] --- yaml --- r: 72758 b: refs/heads/master c: 73a2bcb0edb9ffb0b007b3546b430e2c6e415eee h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/proc/array.c | 3 ++- trunk/include/linux/sched.h | 1 + trunk/kernel/fork.c | 1 + 4 files changed, 5 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 49edb91c4192..6d6fe73f31cd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f7402e0361d4472535e07cfca648f2fa81d85cd2 +refs/heads/master: 73a2bcb0edb9ffb0b007b3546b430e2c6e415eee diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 63c95afb561f..d80baaabf835 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/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) diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 3c07d595979f..b0b1fe6e0b17 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -1009,6 +1009,7 @@ struct task_struct { unsigned int rt_priority; cputime_t utime, stime, utimescaled, stimescaled; cputime_t gtime; + cputime_t prev_utime; 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 ddafdfac9456..a65bfc47177c 100644 --- a/trunk/kernel/fork.c +++ b/trunk/kernel/fork.c @@ -1056,6 +1056,7 @@ static struct task_struct *copy_process(unsigned long clone_flags, p->gtime = cputime_zero; p->utimescaled = cputime_zero; p->stimescaled = cputime_zero; + p->prev_utime = cputime_zero; #ifdef CONFIG_TASK_XACCT p->rchar = 0; /* I/O counter: bytes read */