diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:50:10 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-14 09:50:10 +0100 |
| commit | c550033ced484d8d333bc1edc0a482728680e689 (patch) | |
| tree | f5e10a2879a2a446be8d4aefb385cd6845c19c72 /kernel | |
| parent | a98fe7f3425c6b4e90de16f8da63b0429a8fed08 (diff) | |
| parent | 7a46c594bf7f1f2eeb1e12d4b857d5f581957a92 (diff) | |
Merge branch 'core/percpu' into x86/core
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 0a76d0b6f215..61e63562f273 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9599,10 +9599,11 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime) cpu = task_cpu(tsk); ca = task_ca(tsk); - for (; ca; ca = ca->parent) { + do { u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu); *cpuusage += cputime; - } + ca = ca->parent; + } while (ca); } struct cgroup_subsys cpuacct_subsys = { |