Merge branch 'linus' into x86/core

[linux-2.6-omap-h63xx.git] / kernel / sched.c

diff --git a/kernel/sched.c b/kernel/sched.c
index f4c413bdd38d790e10957e970edc02657c245670..2246591f3711f3717a2228b64995bebf1b81d38a 100644 (file)
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -10001,10 +10001,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 = {