aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-03-30 10:14:40 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-30 10:15:05 -0400
commit5a3c8fe7353f78b73b9636353c6f7b881f19ebea (patch)
treee916946ff1ecc14aeaa36242b1b0bbf781221707
parent3fab191002b184e4390aa07c7149c6cc7b638ec7 (diff)
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>
-rw-r--r--kernel/sched.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/kernel/sched.c b/kernel/sched.c
index 2246591f3711..f4c413bdd38d 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -10001,11 +10001,10 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime)
10001 cpu = task_cpu(tsk); 10001 cpu = task_cpu(tsk);
10002 ca = task_ca(tsk); 10002 ca = task_ca(tsk);
10003 10003
10004 do { 10004 for (; ca; ca = ca->parent) {
10005 u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu); 10005 u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
10006 *cpuusage += cputime; 10006 *cpuusage += cputime;
10007 ca = ca->parent; 10007 }
10008 } while (ca);
10009} 10008}
10010 10009
10011struct cgroup_subsys cpuacct_subsys = { 10010struct cgroup_subsys cpuacct_subsys = {