From 740be6873518f8b0a0cf55b69504eb84cd53a3d0 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 12 Mar 2009 09:23:01 +0800
Subject: [PATCH] --- yaml --- r: 138719 b: refs/heads/master c:
 7a46c594bf7f1f2eeb1e12d4b857d5f581957a92 h: refs/heads/master i:   138717:
 8f6f00591c86b2d50641ce5487f6d91c37e6529b   138715:
 44ed27bbbb52749a88d28ee85831aa0faff924c2   138711:
 e51ebeebe54d8212ab2492dd10aa51a4974f8f35   138703:
 9830f8c7fae3b84aff2e0922418850a6a26cf031   138687:
 48de3aeb906e7162d417213f981a58e5784833ee v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

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