genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP

lockdep_is_held() is defined when CONFIG_LOCKDEP, not CONFIG_PROVE_LOCKING.

Cc: "David S. Miller" <[email protected]>
Cc: Jesse Gross <[email protected]>
Signed-off-by: WANG Cong <[email protected]>
Signed-off-by: David S. Miller <[email protected]>

diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 7a114016ac7de83cf44190ebadec99b12f924cf4..5ab61c1eb6bf2c5ab1234aaee230d61991eef535 100644 (file)
--- a/include/linux/genetlink.h
+++ b/include/linux/genetlink.h
@@ -85,7 +85,7 @@ 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
+#ifdef CONFIG_LOCKDEP
 extern int lockdep_genl_is_held(void);
 #endif
 

diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c
index 62ebe3c6291c73776033cc91836c9670db054d3e..fda497412fc34a5b10aa25a1c7599118d5e832a8 100644 (file)
--- a/net/netlink/genetlink.c
+++ b/net/netlink/genetlink.c
@@ -33,7 +33,7 @@ void genl_unlock(void)
 }
 EXPORT_SYMBOL(genl_unlock);
 
-#ifdef CONFIG_PROVE_LOCKING
+#ifdef CONFIG_LOCKDEP
 int lockdep_genl_is_held(void)
 {
        return lockdep_is_held(&genl_mutex);