diff options
| author |   Herbert Xu <herbert@gondor.apana.org.au> | 2014-11-13 18:11:18 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-11-13 15:13:05 -0500 |
| commit | 971275662040beef8f73f8e5dbcfb3d76a14bf04 (patch) | |
| tree | 7226d59d21634991d9f2cc61a3b5beccdd56d3d8 /net/netlink | |
| parent | net: sh_eth: Add r8a7793 support (diff) | |
| download | linux-dev-971275662040beef8f73f8e5dbcfb3d76a14bf04.tar.xz linux-dev-971275662040beef8f73f8e5dbcfb3d76a14bf04.zip | |
netlink: Move mutex_is_held under PROVE_LOCKING
The rhashtable function mutex_is_held is only used when PROVE_LOCKING
is enabled. This patch modifies netlink so that we can rhashtable.h
itself can later make mutex_is_held optional depending on PROVE_LOCKING.
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net/netlink')
| -rw-r--r-- | net/netlink/af_netlink.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/net/netlink/af_netlink.c b/net/netlink/af_netlink.c index 580b79452bec..53b8ea793191 100644 --- a/net/netlink/af_netlink.c +++ b/net/netlink/af_netlink.c @@ -114,14 +114,14 @@ static atomic_t nl_table_users = ATOMIC_INIT(0); DEFINE_MUTEX(nl_sk_hash_lock); EXPORT_SYMBOL_GPL(nl_sk_hash_lock); +#ifdef CONFIG_PROVE_LOCKING static int lockdep_nl_sk_hash_is_held(void) { -#ifdef CONFIG_LOCKDEP if (debug_locks) return lockdep_is_held(&nl_sk_hash_lock) || lockdep_is_held(&nl_table_lock); -#endif return 1; } +#endif static ATOMIC_NOTIFIER_HEAD(netlink_chain); @@ -3133,7 +3133,9 @@ static int __init netlink_proto_init(void) .max_shift = 16, /* 64K */ .grow_decision = rht_grow_above_75, .shrink_decision = rht_shrink_below_30, +#ifdef CONFIG_PROVE_LOCKING .mutex_is_held = lockdep_nl_sk_hash_is_held, +#endif }; if (err != 0) |