aboutsummaryrefslogtreecommitdiffstats
path: root/net/netlink/af_netlink.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/netlink/af_netlink.c')
-rw-r--r--net/netlink/af_netlink.c6
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);
114DEFINE_MUTEX(nl_sk_hash_lock); 114DEFINE_MUTEX(nl_sk_hash_lock);
115EXPORT_SYMBOL_GPL(nl_sk_hash_lock); 115EXPORT_SYMBOL_GPL(nl_sk_hash_lock);
116 116
117#ifdef CONFIG_PROVE_LOCKING
117static int lockdep_nl_sk_hash_is_held(void) 118static int lockdep_nl_sk_hash_is_held(void)
118{ 119{
119#ifdef CONFIG_LOCKDEP
120 if (debug_locks) 120 if (debug_locks)
121 return lockdep_is_held(&nl_sk_hash_lock) || lockdep_is_held(&nl_table_lock); 121 return lockdep_is_held(&nl_sk_hash_lock) || lockdep_is_held(&nl_table_lock);
122#endif
123 return 1; 122 return 1;
124} 123}
124#endif
125 125
126static ATOMIC_NOTIFIER_HEAD(netlink_chain); 126static ATOMIC_NOTIFIER_HEAD(netlink_chain);
127 127
@@ -3133,7 +3133,9 @@ static int __init netlink_proto_init(void)
3133 .max_shift = 16, /* 64K */ 3133 .max_shift = 16, /* 64K */
3134 .grow_decision = rht_grow_above_75, 3134 .grow_decision = rht_grow_above_75,
3135 .shrink_decision = rht_shrink_below_30, 3135 .shrink_decision = rht_shrink_below_30,
3136#ifdef CONFIG_PROVE_LOCKING
3136 .mutex_is_held = lockdep_nl_sk_hash_is_held, 3137 .mutex_is_held = lockdep_nl_sk_hash_is_held,
3138#endif
3137 }; 3139 };
3138 3140
3139 if (err != 0) 3141 if (err != 0)