From: Denis V. Lunev <den@openvz.org>
Date: Fri, 29 Feb 2008 22:15:19 +0000 (-0800)
Subject: [ICMP]: Section conflict between icmp_sk_init/icmp_sk_exit.
X-Git-Tag: v2.6.26-rc1~1138^2~529
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab;p=linux-2.6-omap-h63xx.git

[ICMP]: Section conflict between icmp_sk_init/icmp_sk_exit.

Functions from __exit section should not be called from ones in __init
section. Fix this conflict.

Signed-off-by: Denis V. Lunev <den@openvz.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c
index b51f4b0a326..cee77d606fb 100644
--- a/net/ipv4/icmp.c
+++ b/net/ipv4/icmp.c
@@ -1198,7 +1198,9 @@ int __net_init icmp_sk_init(struct net *net)
 	return 0;
 
 fail:
-	icmp_sk_exit(net);
+	for_each_possible_cpu(i)
+		sk_release_kernel(net->ipv4.icmp_sk[i]);
+	kfree(net->ipv4.icmp_sk);
 	return err;
 }