diff options
| author | Linus Torvalds <[email protected]> | 2013-04-14 11:12:17 -0700 |
|---|---|---|
| committer | Linus Torvalds <[email protected]> | 2013-04-14 11:12:17 -0700 |
| commit | af788e35bff2b98a413c3e81b13c2a27ef6b7528 (patch) | |
| tree | 517e7406fb42018a81f558def284a96948fd5002 /kernel/sched/cputime.c | |
| parent | ae9f4939bad09767c0532f76ccc48cec0ff3ea4e (diff) | |
| parent | e614b3332a4f3f264a26da28e5a1f4cc3aea3974 (diff) | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Misc fixlets"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/cputime: Fix accounting on multi-threaded processes
sched/debug: Fix sd->*_idx limit range avoiding overflow
sched_clock: Prevent 64bit inatomicity on 32bit systems
sched: Convert BUG_ON()s in try_to_wake_up_local() to WARN_ON_ONCE()s
Diffstat (limited to 'kernel/sched/cputime.c')
| -rw-r--r-- | kernel/sched/cputime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/sched/cputime.c b/kernel/sched/cputime.c index ed12cbb135f4..e93cca92f38b 100644 --- a/kernel/sched/cputime.c +++ b/kernel/sched/cputime.c @@ -310,7 +310,7 @@ void thread_group_cputime(struct task_struct *tsk, struct task_cputime *times) t = tsk; do { - task_cputime(tsk, &utime, &stime); + task_cputime(t, &utime, &stime); times->utime += utime; times->stime += stime; times->sum_exec_runtime += task_sched_runtime(t); |