---

yaml --- r: 366101 b: refs/heads/master c: a2b0ae2 h: refs/heads/master i: 366099: a20dbd7 v: v3
git-mirror · Apr 10, 2013 · 91f84d8 · 91f84d8
1 parent 373297d
commit 91f84d8
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git 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
@@ -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) {