---

yaml --- r: 135692 b: refs/heads/master c: c40c6f8 h: refs/heads/master v: v3
git-mirror · Feb 26, 2009 · 02e3cc4 · 02e3cc4
1 parent 2447280
commit 02e3cc4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4434e5156409eb3ec98f5ad7f0a0c07ebafe970d
+refs/heads/master: c40c6f85a7594ad842233885386a0ca4cd40eafe
diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c
@@ -9684,7 +9684,7 @@ static void cpuacct_charge(struct task_struct *tsk, u64 cputime)
 	struct cpuacct *ca;
 	int cpu;
 
-	if (!cpuacct_subsys.active)
+	if (unlikely(!cpuacct_subsys.active))
 		return;
 
 	cpu = task_cpu(tsk);