From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 30 Mar 2009 14:14:40 +0000 (+0200)
Subject: Revert "cpuacct: reduce one NULL check in fast-path"
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5a3c8fe7353f78b73b9636353c6f7b881f19ebea;p=linux-2.6-omap-h63xx.git

Revert "cpuacct: reduce one NULL check in fast-path"

This reverts commit 7a46c594bf7f1f2eeb1e12d4b857d5f581957a92.

This was applied to the x86 tree mistakenly, it belongs into the
scheduler tree.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/kernel/sched.c b/kernel/sched.c
index 2246591f371..f4c413bdd38 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -10001,11 +10001,10 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime)
 	cpu = task_cpu(tsk);
 	ca = task_ca(tsk);
 
-	do {
+	for (; ca; ca = ca->parent) {
 		u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
 		*cpuusage += cputime;
-		ca = ca->parent;
-	} while (ca);
+	}
 }
 
 struct cgroup_subsys cpuacct_subsys = {