From 1e218988db18fc836764176587b336aa376fbff6 Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@sw.ru>
Date: Mon, 3 Mar 2008 12:02:54 -0800
Subject: [PATCH] --- yaml --- r: 89986 b: refs/heads/master c:
 8ed7edce82ca0d8d3adba8c08cd42337af6c758c h: refs/heads/master v: v3

---
 [refs]                | 2 +-
 trunk/net/ipv6/icmp.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 21d5bdbcaa46..0f2a15b6e91d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7cd04fa7e35100877592f6be4efdccac0fed62b2
+refs/heads/master: 8ed7edce82ca0d8d3adba8c08cd42337af6c758c
diff --git a/trunk/net/ipv6/icmp.c b/trunk/net/ipv6/icmp.c
index 9f55a965c884..8f44d49fcee2 100644
--- a/trunk/net/ipv6/icmp.c
+++ b/trunk/net/ipv6/icmp.c
@@ -844,7 +844,7 @@ static void __net_exit icmpv6_sk_exit(struct net *net)
 	kfree(net->ipv6.icmp_sk);
 }
 
-static struct pernet_operations __net_initdata icmpv6_sk_ops = {
+static struct pernet_operations icmpv6_sk_ops = {
        .init = icmpv6_sk_init,
        .exit = icmpv6_sk_exit,
 };
@@ -868,7 +868,7 @@ int __init icmpv6_init(void)
 	return err;
 }
 
-void __exit icmpv6_cleanup(void)
+void icmpv6_cleanup(void)
 {
 	unregister_pernet_subsys(&icmpv6_sk_ops);
 	inet6_del_protocol(&icmpv6_protocol, IPPROTO_ICMPV6);