diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-30 16:14:40 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-30 16:15:05 +0200 |
| commit | 5a3c8fe7353f78b73b9636353c6f7b881f19ebea (patch) | |
| tree | e916946ff1ecc14aeaa36242b1b0bbf781221707 /kernel | |
| parent | 3fab191002b184e4390aa07c7149c6cc7b638ec7 (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>
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/sched.c | 5 |
1 files changed, 2 insertions, 3 deletions
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 = { |