From 9a12757cc1195ac70fda68271ebbe84186aeee6b Mon Sep 17 00:00:00 2001
From: Li Zefan <lizefan@huawei.com>
Date: Thu, 24 Jan 2013 14:31:27 +0800
Subject: [PATCH] --- yaml --- r: 350328 b: refs/heads/master c:
 86a3db5643c7d29bb36ca85c7a4bb67ad4d88d77 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index a78d68e22137..dbdbe264bad2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2a73991b76cbd38c4a0c6704449ccc08c89c3ff3
+refs/heads/master: 86a3db5643c7d29bb36ca85c7a4bb67ad4d88d77
diff --git a/trunk/kernel/cgroup.c b/trunk/kernel/cgroup.c
index a04932281bc9..af993919aa04 100644
--- a/trunk/kernel/cgroup.c
+++ b/trunk/kernel/cgroup.c
@@ -892,7 +892,7 @@ static void cgroup_diput(struct dentry *dentry, struct inode *inode)
 		simple_xattrs_free(&cgrp->xattrs);
 
 		ida_simple_remove(&cgrp->root->cgroup_ida, cgrp->id);
-		kfree_rcu(cgrp, rcu_head);
+		kfree(cgrp);
 	} else {
 		struct cfent *cfe = __d_cfe(dentry);
 		struct cgroup *cgrp = dentry->d_parent->d_fsdata;