From 4010cdabb5ecc6f901f870c281dc0cc83e68552e Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangcong@gmail.com>
Date: Tue, 24 Jul 2012 13:44:01 +0800
Subject: [PATCH] --- yaml --- r: 315824 b: refs/heads/master c:
 320f5ea0cedc08ef65d67e056bcb9d181386ef2c h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/include/linux/genetlink.h | 2 +-
 trunk/net/netlink/genetlink.c   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a9185c5c05bc..3938bb9dbec3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17bcb684f08649a2ab6a7dcd8288332e72d208f1
+refs/heads/master: 320f5ea0cedc08ef65d67e056bcb9d181386ef2c
diff --git a/trunk/include/linux/genetlink.h b/trunk/include/linux/genetlink.h
index 7a114016ac7d..5ab61c1eb6bf 100644
--- a/trunk/include/linux/genetlink.h
+++ b/trunk/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/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
index 62ebe3c6291c..fda497412fc3 100644
--- a/trunk/net/netlink/genetlink.c
+++ b/trunk/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);