From 6ba3b2ebfbb3e1541d5f02cc4616de967758b747 Mon Sep 17 00:00:00 2001
From: Li Zefan <lizefan@huawei.com>
Date: Thu, 24 Jan 2013 14:43:51 +0800
Subject: [PATCH] --- yaml --- r: 350324 b: refs/heads/master c:
 b5d646f5d5a135064232ff3a140a47a5b84bc911 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 0128bc1fda6b..63e6cf8b70d3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2739d3cce9816805fe26774fea2527d5b16e924d
+refs/heads/master: b5d646f5d5a135064232ff3a140a47a5b84bc911
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index ad3359f903f0..8da9048078c5 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -4994,8 +4994,7 @@ void cgroup_exit(struct task_struct *tsk, int run_callbacks)
 	}
 	task_unlock(tsk);
 
-	if (cg)
-		put_css_set_taskexit(cg);
+	put_css_set_taskexit(cg);
 }
 
 /**