diff options
author | Christoph Paasch <christoph.paasch@uclouvain.be> | 2012-12-05 22:03:12 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-12-07 12:57:13 -0500 |
commit | f5f417c063b83ca3de493e79e7d8c9144d9e7368 (patch) | |
tree | dfbc290d4eb3910e113d12c865791b22bd9a141b /net/sctp | |
parent | fd3065b25b69ce345073bbd294a73343a608fd8b (diff) |
sctp: Fix compiler warning when CONFIG_DEBUG_SECTION_MISMATCH=y
WARNING: net/sctp/sctp.o(.text+0x72f1): Section mismatch in reference
from the function sctp_net_init() to the function
.init.text:sctp_proc_init()
The function sctp_net_init() references
the function __init sctp_proc_init().
This is often because sctp_net_init lacks a __init
annotation or the annotation of sctp_proc_init is wrong.
And put __net_init after 'int' for sctp_proc_init - as it is done
everywhere else in the sctp-stack.
Signed-off-by: Christoph Paasch <christoph.paasch@uclouvain.be>
Acked-by: Neil Horman <nhorman@tuxdriver.com>
Acked-by: Vlad Yasevich <vyasevich@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/sctp')
-rw-r--r-- | net/sctp/protocol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sctp/protocol.c b/net/sctp/protocol.c index 456bc3dbdd51..2c7785bacf74 100644 --- a/net/sctp/protocol.c +++ b/net/sctp/protocol.c | |||
@@ -86,7 +86,7 @@ int sysctl_sctp_rmem[3]; | |||
86 | int sysctl_sctp_wmem[3]; | 86 | int sysctl_sctp_wmem[3]; |
87 | 87 | ||
88 | /* Set up the proc fs entry for the SCTP protocol. */ | 88 | /* Set up the proc fs entry for the SCTP protocol. */ |
89 | static __net_init int sctp_proc_init(struct net *net) | 89 | static int __net_init sctp_proc_init(struct net *net) |
90 | { | 90 | { |
91 | #ifdef CONFIG_PROC_FS | 91 | #ifdef CONFIG_PROC_FS |
92 | net->sctp.proc_net_sctp = proc_net_mkdir(net, "sctp", net->proc_net); | 92 | net->sctp.proc_net_sctp = proc_net_mkdir(net, "sctp", net->proc_net); |
@@ -1165,7 +1165,7 @@ static void sctp_v4_del_protocol(void) | |||
1165 | unregister_inetaddr_notifier(&sctp_inetaddr_notifier); | 1165 | unregister_inetaddr_notifier(&sctp_inetaddr_notifier); |
1166 | } | 1166 | } |
1167 | 1167 | ||
1168 | static int sctp_net_init(struct net *net) | 1168 | static int __net_init sctp_net_init(struct net *net) |
1169 | { | 1169 | { |
1170 | int status; | 1170 | int status; |
1171 | 1171 | ||
@@ -1290,7 +1290,7 @@ err_sysctl_register: | |||
1290 | return status; | 1290 | return status; |
1291 | } | 1291 | } |
1292 | 1292 | ||
1293 | static void sctp_net_exit(struct net *net) | 1293 | static void __net_exit sctp_net_exit(struct net *net) |
1294 | { | 1294 | { |
1295 | /* Free the local address list */ | 1295 | /* Free the local address list */ |
1296 | sctp_free_addr_wq(net); | 1296 | sctp_free_addr_wq(net); |