Merge branch 'gpio/next' of git://git.secretlab.ca/git/linux-2.6

[~andy/linux] / security / selinux / netif.c

diff --git a/security/selinux/netif.c b/security/selinux/netif.c
index d6095d63d831a63999f1921fbed460a94140fc39..58cc481c93d5e580e554cd9b3b61bc9214128193 100644 (file)
--- a/security/selinux/netif.c
+++ b/security/selinux/netif.c
@@ -103,22 +103,6 @@ static int sel_netif_insert(struct sel_netif *netif)
        return 0;
 }
 
-/**
- * sel_netif_free - Frees an interface entry
- * @p: the entry's RCU field
- *
- * Description:
- * This function is designed to be used as a callback to the call_rcu()
- * function so that memory allocated to a hash table interface entry can be
- * released safely.
- *
- */
-static void sel_netif_free(struct rcu_head *p)
-{
-       struct sel_netif *netif = container_of(p, struct sel_netif, rcu_head);
-       kfree(netif);
-}
-
 /**
  * sel_netif_destroy - Remove an interface record from the table
  * @netif: the existing interface record
@@ -131,7 +115,7 @@ static void sel_netif_destroy(struct sel_netif *netif)
 {
        list_del_rcu(&netif->list);
        sel_netif_total--;
-       call_rcu(&netif->rcu_head, sel_netif_free);
+       kfree_rcu(netif, rcu_head);
 }
 
 /**