The following commit has been merged into the core/rcu branch of tip: Commit-ID: d97f3bdf7a1c0346d3a272aa756d16633f0b8b3b Gitweb: https://git.kernel.org/tip/d97f3bdf7a1c0346d3a272aa756d16633f0b8b3b Author: Jakub Kicinski <[email protected]> AuthorDate: Wed, 16 Sep 2020 11:45:24 -07:00 Committer: Paul E. McKenney <[email protected]> CommitterDate: Mon, 02 Nov 2020 17:09:59 -08:00
net: Un-hide lockdep_sock_is_held() for !LOCKDEP Currently, variables used only within lockdep expressions are flagged as unused, requiring that these variables' declarations be decorated with either #ifdef or __maybe_unused. This results in ugly code. This commit therefore causes the lockdep_sock_is_held() function to be visible even when lockdep is not enabled, thus removing the need for these decorations. This approach further relies on dead-code elimination to remove any references to functions or variables that are not available in non-lockdep kernels. Signed-off-by: Jakub Kicinski <[email protected]> Signed-off-by: Paul E. McKenney <[email protected]> --- include/net/sock.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index a5c6ae7..198d548 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -1566,13 +1566,11 @@ do { \ lockdep_init_map(&(sk)->sk_lock.dep_map, (name), (key), 0); \ } while (0) -#ifdef CONFIG_LOCKDEP static inline bool lockdep_sock_is_held(const struct sock *sk) { return lockdep_is_held(&sk->sk_lock) || lockdep_is_held(&sk->sk_lock.slock); } -#endif void lock_sock_nested(struct sock *sk, int subclass);
