diff options
author | WANG Cong <xiyou.wangcong@gmail.com> | 2012-07-24 01:44:01 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2012-07-24 03:01:30 -0400 |
commit | 320f5ea0cedc08ef65d67e056bcb9d181386ef2c (patch) | |
tree | 5845fb51d8cdd01729bba4e757e38a801386a4fb | |
parent | 17bcb684f08649a2ab6a7dcd8288332e72d208f1 (diff) |
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.h | 2 | ||||
-rw-r--r-- | net/netlink/genetlink.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/genetlink.h b/include/linux/genetlink.h index 7a114016ac7d..5ab61c1eb6bf 100644 --- a/include/linux/genetlink.h +++ b/include/linux/genetlink.h | |||
@@ -85,7 +85,7 @@ enum { | |||
85 | /* All generic netlink requests are serialized by a global lock. */ | 85 | /* All generic netlink requests are serialized by a global lock. */ |
86 | extern void genl_lock(void); | 86 | extern void genl_lock(void); |
87 | extern void genl_unlock(void); | 87 | extern void genl_unlock(void); |
88 | #ifdef CONFIG_PROVE_LOCKING | 88 | #ifdef CONFIG_LOCKDEP |
89 | extern int lockdep_genl_is_held(void); | 89 | extern int lockdep_genl_is_held(void); |
90 | #endif | 90 | #endif |
91 | 91 | ||
diff --git a/net/netlink/genetlink.c b/net/netlink/genetlink.c index 62ebe3c6291c..fda497412fc3 100644 --- a/net/netlink/genetlink.c +++ b/net/netlink/genetlink.c | |||
@@ -33,7 +33,7 @@ void genl_unlock(void) | |||
33 | } | 33 | } |
34 | EXPORT_SYMBOL(genl_unlock); | 34 | EXPORT_SYMBOL(genl_unlock); |
35 | 35 | ||
36 | #ifdef CONFIG_PROVE_LOCKING | 36 | #ifdef CONFIG_LOCKDEP |
37 | int lockdep_genl_is_held(void) | 37 | int lockdep_genl_is_held(void) |
38 | { | 38 | { |
39 | return lockdep_is_held(&genl_mutex); | 39 | return lockdep_is_held(&genl_mutex); |