Commit 5a3c8fe7 authored by Ingo Molnar's avatar Ingo Molnar

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

This reverts commit 7a46c594.

This was applied to the x86 tree mistakenly, it belongs into the
scheduler tree.
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 3fab1910
...@@ -10001,11 +10001,10 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime) ...@@ -10001,11 +10001,10 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime)
cpu = task_cpu(tsk); cpu = task_cpu(tsk);
ca = task_ca(tsk); ca = task_ca(tsk);
do { for (; ca; ca = ca->parent) {
u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu); u64 *cpuusage = per_cpu_ptr(ca->cpuusage, cpu);
*cpuusage += cputime; *cpuusage += cputime;
ca = ca->parent; }
} while (ca);
} }
struct cgroup_subsys cpuacct_subsys = { struct cgroup_subsys cpuacct_subsys = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment