diff --git a/[refs] b/[refs] index d200288cbf5f..f92c5364d29e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 621e2de02403a6f776852c564b79c38bf3cc9032 +refs/heads/master: a2b0ae25fc8bfeeb4022b8e847ab811b3c8368d1 diff --git a/trunk/kernel/sched/cpuacct.c b/trunk/kernel/sched/cpuacct.c index 75e46d291f9c..ef57ab658722 100644 --- a/trunk/kernel/sched/cpuacct.c +++ b/trunk/kernel/sched/cpuacct.c @@ -247,9 +247,6 @@ void cpuacct_charge(struct task_struct *tsk, u64 cputime) struct cpuacct *ca; int cpu; - if (unlikely(!cpuacct_subsys.active)) - return; - cpu = task_cpu(tsk); rcu_read_lock(); @@ -278,9 +275,6 @@ void cpuacct_account_field(struct task_struct *p, int index, u64 val) struct kernel_cpustat *kcpustat; struct cpuacct *ca; - if (unlikely(!cpuacct_subsys.active)) - return; - rcu_read_lock(); ca = task_ca(p); while (ca != &root_cpuacct) {