summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorYing Xue <ying.xue@windriver.com>2013-02-15 22:28:25 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-28 06:59:06 -0800
commit1e6b5fb5ce92028f6c87864712ed7290446a4c11 (patch)
tree0426fe2c4e1f79732c2957659a0adc6e4476cdcb /include
parent29b3bb0be43fea0a49e5235894e1dcbc0ac299dc (diff)
downloadlinux-3.10-1e6b5fb5ce92028f6c87864712ed7290446a4c11.tar.gz
linux-3.10-1e6b5fb5ce92028f6c87864712ed7290446a4c11.tar.bz2
linux-3.10-1e6b5fb5ce92028f6c87864712ed7290446a4c11.zip
net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
[ Upstream commit dec34fb0f5b7873de45132a84a3af29e61084a6b ] When SOCK_REFCNT_DEBUG is enabled, below build error is met: kernel/sysctl_binary.o: In function `sk_refcnt_debug_release': include/net/sock.h:1025: multiple definition of `sk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here kernel/audit.o: In function `sk_refcnt_debug_release': include/net/sock.h:1025: multiple definition of `sk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here make[1]: *** [kernel/built-in.o] Error 1 make: *** [kernel] Error 2 So we decide to make sk_refcnt_debug_release static to eliminate the error. Signed-off-by: Ying Xue <ying.xue@windriver.com> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include')
-rw-r--r--include/net/sock.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/net/sock.h b/include/net/sock.h
index 5878118e3ce..59a8947a194 100644
--- a/include/net/sock.h
+++ b/include/net/sock.h
@@ -944,7 +944,7 @@ static inline void sk_refcnt_debug_dec(struct sock *sk)
sk->sk_prot->name, sk, atomic_read(&sk->sk_prot->socks));
}
-inline void sk_refcnt_debug_release(const struct sock *sk)
+static inline void sk_refcnt_debug_release(const struct sock *sk)
{
if (atomic_read(&sk->sk_refcnt) != 1)
printk(KERN_DEBUG "Destruction of the %s socket %p delayed, refcnt=%d\n",