From 02e3cc484da31502acb95f366d6e750f6ce9c9eb Mon Sep 17 00:00:00 2001
From: Li Zefan <lizf@cn.fujitsu.com>
Date: Thu, 26 Feb 2009 15:40:15 +0800
Subject: [PATCH] --- yaml --- r: 135692 b: refs/heads/master c:
 c40c6f85a7594ad842233885386a0ca4cd40eafe h: refs/heads/master v: v3

---
 [refs]               | 2 +-
 trunk/kernel/sched.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index cec3344837a4..7a7c5dbaf84e 100644
--- 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
index 5475d56a20f1..8e63ffb6ed05 100644
--- 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);