| Message ID | 1460066015-22105-1-git-send-email-hannes@stressinduktion.org |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Hannes Frederic Sowa <hannes@stressinduktion.org> Date: Thu, 7 Apr 2016 23:53:35 +0200 > I forgot to add inline to lockdep_sock_is_held, so it generated all > kinds of build warnings if not build with lockdep support. > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> Applied, thanks.
On Thu, 2016-04-07 at 23:53 +0200, Hannes Frederic Sowa wrote: > I forgot to add inline to lockdep_sock_is_held, so it generated all > kinds of build warnings if not build with lockdep support. > > Reported-by: kbuild test robot <fengguang.wu@intel.com> > Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> > --- > include/net/sock.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/include/net/sock.h b/include/net/sock.h > index eb2d7c3e120b25..46b29374df8ed7 100644 > --- a/include/net/sock.h > +++ b/include/net/sock.h > @@ -1360,7 +1360,7 @@ do { \ > lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ > } while (0) > > -static bool lockdep_sock_is_held(const struct sock *csk) > +static inline bool lockdep_sock_is_held(const struct sock *csk) > { > struct sock *sk = (struct sock *)csk; > But... this wont solve the compiler error ? include/net/sock.h: In function 'lockdep_sock_is_held': include/net/sock.h:1367:2: error: implicit declaration of function 'lockdep_is_held' [-Werror=implicit-function-declaration] In file included from security/lsm_audit.c:20:0: include/net/sock.h: In function 'lockdep_sock_is_held': include/net/sock.h:1367:2: error: implicit declaration of function 'lockdep_is_held' [-Werror=implicit-function-declaration] $ egrep "LOCKDEP|PROVE" .config CONFIG_LOCKDEP_SUPPORT=y # CONFIG_PROVE_LOCKING is not set # CONFIG_PROVE_RCU is not set
diff --git a/include/net/sock.h b/include/net/sock.h index eb2d7c3e120b25..46b29374df8ed7 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1360,7 +1360,7 @@ do { \ lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ } while (0) -static bool lockdep_sock_is_held(const struct sock *csk) +static inline bool lockdep_sock_is_held(const struct sock *csk) { struct sock *sk = (struct sock *)csk;
I forgot to add inline to lockdep_sock_is_held, so it generated all kinds of build warnings if not build with lockdep support. Reported-by: kbuild test robot <fengguang.wu@intel.com> Signed-off-by: Hannes Frederic Sowa <hannes@stressinduktion.org> --- include/net/sock.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)