diff --git a/[refs] b/[refs] index d8a21044554f..27f23242c31e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 65a37b29a8d7492f081d4f8da2227467af1c0c1d +refs/heads/master: 7a46c594bf7f1f2eeb1e12d4b857d5f581957a92 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 0a76d0b6f215..61e63562f273 100644 --- a/trunk/kernel/sched.c +++ b/trunk/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 = {