net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
Subsystems (3)
PATCH 1/1 net: fix a compile error when SOCK_REFCNT_DEBUG is enabled
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.
--- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
include/net/sock.h +1 -1
@@ -1037,7 +1037,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",
Signature · 1 line
1.7.9.5
David Miller
maintainerFrom: Ying Xue <[email protected]>
Date: Sat, 16 Feb 2013 16:28:25 +0800
Quoted 11 lines
When
SOCK_REFCNT_DEBUGis enabled, below build error is met:
kernel/sysctl_binary.o: In function `sk_refcnt_debug_release':include/net/sock.h:1025: multiple definition ofsk_refcnt_debug_release' kernel/sysctl.o:include/net/sock.h:1025: first defined here kernel/audit.o: In functionsk_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
Quoted 4 lines
So we decide to make
sk_refcnt_debug_releasestatic to eliminate the error.Signed-off-by Ying Xue <[email protected]>
Applied and queued up for -stable, thanks.