summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWANG Cong <xiyou.wangcong@gmail.com>2012-07-24 13:44:01 +0800
committerDavid S. Miller <davem@davemloft.net>2012-07-24 00:01:30 -0700
commit320f5ea0cedc08ef65d67e056bcb9d181386ef2c (patch)
tree5845fb51d8cdd01729bba4e757e38a801386a4fb
parent17bcb684f08649a2ab6a7dcd8288332e72d208f1 (diff)
downloadlinux-3.10-320f5ea0cedc08ef65d67e056bcb9d181386ef2c.tar.gz
linux-3.10-320f5ea0cedc08ef65d67e056bcb9d181386ef2c.tar.bz2
linux-3.10-320f5ea0cedc08ef65d67e056bcb9d181386ef2c.zip
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" <davem@davemloft.net> Cc: Jesse Gross <jesse@nicira.com> Signed-off-by: WANG Cong <xiyou.wangcong@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--include/linux/genetlink.h2
-rw-r--r--net/netlink/genetlink.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h
index 7a114016ac7..5ab61c1eb6b 100644
--- 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 62ebe3c6291..fda497412fc 100644
--- 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);