diff --git a/[refs] b/[refs] index 3d620ab2fd57..d0a77487c258 100644 --- 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 index 61549b26ad6f..59311adfb0e0 100644 --- 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 index 8a36599d3555..28453ae2a97b 100644 --- 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)