From 6ee388a9efca9ef3855a87168ea7831ad1cacf27 Mon Sep 17 00:00:00 2001 From: Ingo Molnar Date: Mon, 30 Mar 2009 16:14:40 +0200 Subject: [PATCH] --- yaml --- r: 138835 b: refs/heads/master c: 5a3c8fe7353f78b73b9636353c6f7b881f19ebea h: refs/heads/master i: 138833: efed1ee2044829334665573f49ea2fd249b9d58e 138831: c426721a632867016e8ac3f5c64f1248928199fb v: v3 --- [refs] | 2 +- trunk/kernel/sched.c | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 6bc93a5f4329..5cf2783f3e42 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3fab191002b184e4390aa07c7149c6cc7b638ec7 +refs/heads/master: 5a3c8fe7353f78b73b9636353c6f7b881f19ebea diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 2246591f3711..f4c413bdd38d 100644 --- a/trunk/kernel/sched.c +++ b/trunk/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 = {