rds: Proper init/exit declaration for module init/exit function

Changed all the module init and exit function declarations such that
they are placed in .init.text and .exit.text sections respectively.

Orabug: 27013833

Signed-off-by: Ka-Cheong Poon <ka-cheong.poon@oracle.com>
Reviewed-by: Shannon Nelson <shannon.nelson@oracle.com>
Reviewed-by: Håkon Bugge <haakon.bugge@oracle.com>
Signed-off-by: Dhaval Giani <dhaval.giani@oracle.com>

diff --git a/net/rds/af_rds.c b/net/rds/af_rds.c
index eaed977aa9bff025849dc717cfc465f2a4302998..4e84ca544794898d0cfbbf3c334d3176efbda9dd 100644 (file)
--- a/net/rds/af_rds.c
+++ b/net/rds/af_rds.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2006 Oracle.  All rights reserved.
+ * Copyright (c) 2006, 2017 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -903,7 +903,7 @@ static void rds_qos_threshold_init(void)
        }
 }
 
-static void rds_exit(void)
+static void __exit rds_exit(void)
 {
        sock_unregister(rds_family_ops.family);
        proto_unregister(&rds_proto);
@@ -921,7 +921,7 @@ module_exit(rds_exit);
 
 u32 rds_gen_num;
 
-static int rds_init(void)
+static int __init rds_init(void)
 {
        int ret;
 

diff --git a/net/rds/rdma_transport.c b/net/rds/rdma_transport.c
index 3ca32fc165d3850374a380a81f50d822a1b72a02..561d0cbf00155965584715e34a0f2195f4512946 100644 (file)
--- a/net/rds/rdma_transport.c
+++ b/net/rds/rdma_transport.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2009 Oracle.  All rights reserved.
+ * Copyright (c) 2009, 2017 Oracle and/or its affiliates. All rights reserved.
  *
  * This software is available to you under a choice of one of two
  * licenses.  You may choose to be licensed under the terms of the GNU
@@ -405,7 +405,7 @@ out:
 }
 module_init(rds_rdma_init);
 
-void rds_rdma_exit(void)
+void __exit rds_rdma_exit(void)
 {
        /* stop listening first to ensure no new connections are attempted */
        rds_rdma_listen_stop();

diff --git a/net/rds/tcp.c b/net/rds/tcp.c
index 6d6f5cd70c6b451bb70d4e474c12d60093190175..db1838759c0c7c84e53a000918c2aab73cbd95cd 100644 (file)
--- a/net/rds/tcp.c
+++ b/net/rds/tcp.c
@@ -613,7 +613,7 @@ static int rds_tcp_skbuf_handler(struct ctl_table *ctl, int write,
        return 0;
 }
 
-static void rds_tcp_exit(void)
+static void __exit rds_tcp_exit(void)
 {
        rds_info_deregister_func(RDS_INFO_TCP_SOCKETS, rds_tcp_tc_info);
        unregister_pernet_subsys(&rds_tcp_net_ops);
@@ -626,7 +626,7 @@ static void rds_tcp_exit(void)
 }
 module_exit(rds_tcp_exit);
 
-static int rds_tcp_init(void)
+static int __init rds_tcp_init(void)
 {
        int ret;