[IPV6]: Fix non-modular build.

Remove __exit from functions calls from functions
other than module_exit().

Signed-off-by: Peter Chubb <peterc@gelato.unsw.edu.au>
Signed-off-by: Hideaki YOSHIFUJI <yoshfuji@linux-ipv6.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/ipv6/ip6_fib.c b/net/ipv6/ip6_fib.c
index 3e69e1987c44004d0895d574e41dd2d96dd96b9f..405740b75abb7f693d66285815ffdd24a9f17740 100644 (file)
--- a/net/ipv6/ip6_fib.c
+++ b/net/ipv6/ip6_fib.c
@@ -1218,7 +1218,7 @@ void __init fib6_init(void)
                panic("cannot create fib6_nodes cache");
 }
 
-void __exit fib6_gc_cleanup(void)
+void fib6_gc_cleanup(void)
 {
        del_timer(&ip6_fib_timer);
        kmem_cache_destroy(fib6_node_kmem);

diff --git a/net/ipv6/ipv6_sockglue.c b/net/ipv6/ipv6_sockglue.c
index 732227aa86a9a6fd7ef999fc48bf39c6743e99ed..279ab86be662000d7a4fbc04aac630a5af15e5a7 100644 (file)
--- a/net/ipv6/ipv6_sockglue.c
+++ b/net/ipv6/ipv6_sockglue.c
@@ -698,7 +698,7 @@ void __init ipv6_packet_init(void)
        dev_add_pack(&ipv6_packet_type);
 }
 
-void __exit ipv6_packet_cleanup(void)
+void ipv6_packet_cleanup(void)
 {
        dev_remove_pack(&ipv6_packet_type);
 }

diff --git a/net/ipv6/route.c b/net/ipv6/route.c
index 010a04e7c505a5e9ee85096c7f9a4fe4deea90f7..183802902c023eb0fed16e3623097edf17211dd4 100644 (file)
--- a/net/ipv6/route.c
+++ b/net/ipv6/route.c
@@ -2116,7 +2116,7 @@ void __init ip6_route_init(void)
 #endif
 }
 
-void __exit ip6_route_cleanup(void)
+void ip6_route_cleanup(void)
 {
 #ifdef CONFIG_PROC_FS
        proc_net_remove("ipv6_route");

diff --git a/net/ipv6/xfrm6_policy.c b/net/ipv6/xfrm6_policy.c
index 111d6e9ccb91f332989e20af4f4e0d88bde26cc9..8a4f37de4d2da769eff58139e912818d06ae5485 100644 (file)
--- a/net/ipv6/xfrm6_policy.c
+++ b/net/ipv6/xfrm6_policy.c
@@ -276,7 +276,7 @@ static void __init xfrm6_policy_init(void)
        xfrm_policy_register_afinfo(&xfrm6_policy_afinfo);
 }
 
-static void __exit xfrm6_policy_fini(void)
+static void xfrm6_policy_fini(void)
 {
        xfrm_policy_unregister_afinfo(&xfrm6_policy_afinfo);
 }
@@ -287,7 +287,7 @@ void __init xfrm6_init(void)
        xfrm6_state_init();
 }
 
-void __exit xfrm6_fini(void)
+void xfrm6_fini(void)
 {
        //xfrm6_input_fini();
        xfrm6_policy_fini();

diff --git a/net/ipv6/xfrm6_state.c b/net/ipv6/xfrm6_state.c
index 892b39a27aa744766c0f50dc7f27ec6c310c8ca9..bf0d0abc3871b64cccd967f881febcfd0b298396 100644 (file)
--- a/net/ipv6/xfrm6_state.c
+++ b/net/ipv6/xfrm6_state.c
@@ -129,7 +129,7 @@ void __init xfrm6_state_init(void)
        xfrm_state_register_afinfo(&xfrm6_state_afinfo);
 }
 
-void __exit xfrm6_state_fini(void)
+void xfrm6_state_fini(void)
 {
        xfrm_state_unregister_afinfo(&xfrm6_state_afinfo);
 }