From aad13fcbf34f894e6fba8edc85794efa67532e02 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizefan@huawei.com>
Date: Fri, 29 Mar 2013 14:37:29 +0800
Subject: [PATCH] --- yaml --- r: 366095 b: refs/heads/master c:
 543bc0e76e6bb84300eaf9833edc5a481f788678 h: refs/heads/master i:   366093:
 310c6b6816582aee0d79155e5652cffbd5cc5f05   366091:
 c928e593bde1746502cff5e8c34c56113824b367   366087:
 5b222f429644a344991b7000a64a44a06e0b5cca   366079:
 a50738940c5cda0d675f91f7083672c7bed4af8f v: v3

---
 [refs]                       | 2 +-
 trunk/kernel/sched/cpuacct.c | 6 +++++-
 trunk/kernel/sched/cpuacct.h | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 35fca59086ec..cced46e72656 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1966aaf7d54608e8ddb7ac454b461840e763409a
+refs/heads/master: 543bc0e76e6bb84300eaf9833edc5a481f788678
diff --git a/trunk/kernel/sched/cpuacct.c b/trunk/kernel/sched/cpuacct.c
index 72bd971ea377..b2aaaba16d46 100644
--- a/trunk/kernel/sched/cpuacct.c
+++ b/trunk/kernel/sched/cpuacct.c
@@ -210,9 +210,13 @@ void cpuacct_charge(struct task_struct *tsk, u64 cputime)
 
 	ca = task_ca(tsk);
 
-	for (; ca; ca = parent_ca(ca)) {
+	while (true) {
 		u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
 		*cpuusage += cputime;
+
+		ca = parent_ca(ca);
+		if (!ca)
+			break;
 	}
 
 	rcu_read_unlock();
diff --git a/trunk/kernel/sched/cpuacct.h b/trunk/kernel/sched/cpuacct.h
index bd0409b85525..45c168207fcc 100644
--- a/trunk/kernel/sched/cpuacct.h
+++ b/trunk/kernel/sched/cpuacct.h
@@ -36,7 +36,7 @@ static inline struct cpuacct *task_ca(struct task_struct *tsk)
 
 static inline struct cpuacct *parent_ca(struct cpuacct *ca)
 {
-	if (!ca || !ca->css.cgroup->parent)
+	if (!ca->css.cgroup->parent)
 		return NULL;
 	return cgroup_ca(ca->css.cgroup->parent);
 }