diff options
| author | Jonathan Lim <jlim@sgi.com> | 2008-07-25 01:48:40 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-25 10:53:46 -0700 |
| commit | 49b5cf34727a6c1be1568ab28e89a2d9a6bf51e0 (patch) | |
| tree | 29505ad668bfadc67a670ad4ebc5c65823a87413 /kernel/sched.c | |
| parent | 7394f0f6c0baab650ea9194cb1be847df646fb57 (diff) | |
| download | linux-stable-49b5cf34727a6c1be1568ab28e89a2d9a6bf51e0.tar.gz linux-stable-49b5cf34727a6c1be1568ab28e89a2d9a6bf51e0.tar.bz2 linux-stable-49b5cf34727a6c1be1568ab28e89a2d9a6bf51e0.zip | |
accounting: account for user time when updating memory integrals
Adapt acct_update_integrals() to include user time when calculating the time
difference. The units of acct_rss_mem1 and acct_vm_mem1 are also changed from
pages-jiffies to pages-usecs to avoid calling jiffies_to_usecs() in
xacct_add_tsk() which might overflow.
Signed-off-by: Jonathan Lim <jlim@sgi.com>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'kernel/sched.c')
| -rw-r--r-- | kernel/sched.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 6acf749d3336..0047bd9b96aa 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -4046,6 +4046,8 @@ void account_user_time(struct task_struct *p, cputime_t cputime) cpustat->nice = cputime64_add(cpustat->nice, tmp); else cpustat->user = cputime64_add(cpustat->user, tmp); + /* Account for user time used */ + acct_update_integrals(p); } /* |