diff options
| author | Dmitry Kozlov <xeb@mail.ru> | 2014-04-21 15:02:17 +0400 |
|---|---|---|
| committer | Dmitry Kozlov <xeb@mail.ru> | 2014-04-21 15:02:17 +0400 |
| commit | c121ff39225f5a81730cfe87d941af4405d01003 (patch) | |
| tree | 47adbdd0ceb0868ff8720c6619a3423c3bb0af19 /drivers | |
| parent | 33bdf4071ab9db915aa069ef69176f3e4b57484e (diff) | |
| download | accel-ppp-c121ff39225f5a81730cfe87d941af4405d01003.tar.gz accel-ppp-c121ff39225f5a81730cfe87d941af4405d01003.zip | |
ipoe: rename __kfree_rcu to ipoe_kfree_rcu due to conflict with kernel's symbol
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/ipoe/ipoe.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/ipoe/ipoe.c b/drivers/ipoe/ipoe.c index 4071f7d..c7b4b9c 100644 --- a/drivers/ipoe/ipoe.c +++ b/drivers/ipoe/ipoe.c @@ -166,7 +166,7 @@ static void ipoe_update_stats(struct sk_buff *skb, struct ipoe_stats *st, int co #endif #if LINUX_VERSION_CODE < KERNEL_VERSION(3,0,0) -static void __kfree_rcu(struct rcu_head *head) +static void ipoe_kfree_rcu(struct rcu_head *head) { kfree(head); } @@ -659,7 +659,7 @@ nl_err: #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) kfree_rcu(e, rcu_head); #else - call_rcu(&e->rcu_head, __kfree_rcu); + call_rcu(&e->rcu_head, ipoe_kfree_rcu); #endif } @@ -1547,7 +1547,7 @@ static int ipoe_nl_cmd_del_net(struct sk_buff *skb, struct genl_info *info) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) kfree_rcu(n, rcu_head); #else - call_rcu(&n->rcu_head, __kfree_rcu); + call_rcu(&n->rcu_head, ipoe_kfree_rcu); #endif } } @@ -1596,7 +1596,7 @@ static int ipoe_nl_cmd_del_interface(struct sk_buff *skb, struct genl_info *info #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) kfree_rcu(i, rcu_head); #else - call_rcu(&i->rcu_head, __kfree_rcu); + call_rcu(&i->rcu_head, ipoe_kfree_rcu); #endif } } @@ -1735,7 +1735,7 @@ static int ipoe_nl_cmd_del_vlan_mon(struct sk_buff *skb, struct genl_info *info) #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,0,0) kfree_rcu(d, rcu_head); #else - call_rcu(&d->rcu_head, __kfree_rcu); + call_rcu(&d->rcu_head, ipoe_kfree_rcu); #endif } } |