From 3a125adb439465091e21d4deb122130df6ac9c51 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Tue, 15 Mar 2011 18:07:57 +0800
Subject: [PATCH] --- yaml --- r: 257000 b: refs/heads/master c:
 6034f7e603cd2dae8ed9a1d8d2ccfeb6b5c48d73 h: refs/heads/master v: v3

---
 [refs]                         |  2 +-
 trunk/security/device_cgroup.c | 10 +---------
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index a38ee98c3cdd..f14f3c0eb8d5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b119cbab3aecd19dbd748a9823c02d200b96b2f8
+refs/heads/master: 6034f7e603cd2dae8ed9a1d8d2ccfeb6b5c48d73
diff --git a/trunk/security/device_cgroup.c b/trunk/security/device_cgroup.c
index 1be68269e1c2..4450fbeec411 100644
--- a/trunk/security/device_cgroup.c
+++ b/trunk/security/device_cgroup.c
@@ -125,14 +125,6 @@ static int dev_whitelist_add(struct dev_cgroup *dev_cgroup,
 	return 0;
 }
 
-static void whitelist_item_free(struct rcu_head *rcu)
-{
-	struct dev_whitelist_item *item;
-
-	item = container_of(rcu, struct dev_whitelist_item, rcu);
-	kfree(item);
-}
-
 /*
  * called under devcgroup_mutex
  */
@@ -155,7 +147,7 @@ static void dev_whitelist_rm(struct dev_cgroup *dev_cgroup,
 		walk->access &= ~wh->access;
 		if (!walk->access) {
 			list_del_rcu(&walk->list);
-			call_rcu(&walk->rcu, whitelist_item_free);
+			kfree_rcu(walk, rcu);
 		}
 	}
 }