diff options
| author | Denis V. Lunev <den@openvz.org> | 2008-02-29 23:15:19 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-02-29 23:15:19 +0100 |
| commit | 1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab (patch) | |
| tree | 5b028db28a605687c30447b73800f6ef0aded570 /net/ipv4/icmp.c | |
| parent | Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/linville... (diff) | |
| download | linux-1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab.tar.xz linux-1d1c8d13c4f7690d382bca5de2f9dc88f22a4aab.zip | |
[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>
Diffstat (limited to 'net/ipv4/icmp.c')
| -rw-r--r-- | net/ipv4/icmp.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/net/ipv4/icmp.c b/net/ipv4/icmp.c index b51f4b0a3264..cee77d606fbe 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; } |