---

yaml --- r: 315824 b: refs/heads/master c: 320f5ea h: refs/heads/master v: v3
git-mirror · Jul 24, 2012 · 4010cda · 4010cda
1 parent 281f746
commit 4010cda
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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);