diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:10:33 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-01-06 17:10:33 -0800 |
| commit | cfa97f993c275d193fe82c22511dfb5f1e51b661 (patch) | |
| tree | 552cea5db0ef07bbcc5d53850607dcda6f9b664c /kernel/sys.c | |
| parent | 7238eb4ca35cd63340dc02caf757376e40c1210c (diff) | |
| parent | db2f59c8c9b315f2b88b1dac159b988c6009034d (diff) | |
| download | op-kernel-dev-cfa97f993c275d193fe82c22511dfb5f1e51b661.zip op-kernel-dev-cfa97f993c275d193fe82c22511dfb5f1e51b661.tar.gz | |
Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
sched: fix section mismatch
sched: fix double kfree in failure path
sched: clean up arch_reinit_sched_domains()
sched: mark sched_create_sysfs_power_savings_entries() as __init
getrusage: RUSAGE_THREAD should return ru_utime and ru_stime
sched: fix sched_slice()
sched_clock: prevent scd->clock from moving backwards, take #2
sched: sched.c declare variables before they get used
Diffstat (limited to 'kernel/sys.c')
| -rw-r--r-- | kernel/sys.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/sys.c b/kernel/sys.c index 4a43617c..763c3c1 100644 --- a/kernel/sys.c +++ b/kernel/sys.c @@ -1629,6 +1629,8 @@ static void k_getrusage(struct task_struct *p, int who, struct rusage *r) utime = stime = cputime_zero; if (who == RUSAGE_THREAD) { + utime = task_utime(current); + stime = task_stime(current); accumulate_thread_rusage(p, r); goto out; } |
