Merge branch 'core/percpu' into x86/core

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 = {