---

yaml --- r: 278333 b: refs/heads/master c: 86b1309 h: refs/heads/master i: 278331: 01f1fd7 v: v3
git-mirror · Dec 3, 2011 · 466cb7d · 466cb7d
1 parent 6610084
commit 466cb7d
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 263ba61d3b19508dfb003c215ec5d23f882b4f87
+refs/heads/master: 86b1309c7e411b7c25dc0dc7a092582a4d291044
diff --git a/trunk/include/linux/genetlink.h b/trunk/include/linux/genetlink.h
@@ -85,6 +85,9 @@ enum {
 /* All generic netlink requests are serialized by a global lock.  */
 extern void genl_lock(void);
 extern void genl_unlock(void);
+#ifdef CONFIG_PROVE_LOCKING
+extern int lockdep_genl_is_held(void);
+#endif
 
 #endif /* __KERNEL__ */
 

diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
@@ -33,6 +33,14 @@ void genl_unlock(void)
 }
 EXPORT_SYMBOL(genl_unlock);
 
+#ifdef CONFIG_PROVE_LOCKING
+int lockdep_genl_is_held(void)
+{
+	return lockdep_is_held(&genl_mutex);
+}
+EXPORT_SYMBOL(lockdep_genl_is_held);
+#endif
+
 #define GENL_FAM_TAB_SIZE	16
 #define GENL_FAM_TAB_MASK	(GENL_FAM_TAB_SIZE - 1)