From 9b1be2cd4fdf5be8165c7ceb83e4ebfa86193a25 Mon Sep 17 00:00:00 2001
From: James Chapman <jchapman@katalix.com>
Date: Fri, 2 Apr 2010 06:19:05 +0000
Subject: [PATCH] --- yaml --- r: 193943 b: refs/heads/master c:
 f408e0ce40270559ef80f231843c93baa9947bc5 h: refs/heads/master i:   193941:
 97b42ea8211f2ad8f018000d29ea6c7f12620406   193939:
 e9c71ae311c26606324bad58d657dfaa7217dfb6   193935:
 f5b23ca2256a23c5b6c0d34a02fe97db3ec0d6e3 v: v3

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

diff --git a/[refs] b/[refs]
index d6c74ffef8d2..6cc88ff53e0e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0d76751fad7739014485ba5bd388d4f1b4fd4143
+refs/heads/master: f408e0ce40270559ef80f231843c93baa9947bc5
diff --git a/trunk/include/linux/genetlink.h b/trunk/include/linux/genetlink.h
index b834ef6d59fa..61549b26ad6f 100644
--- a/trunk/include/linux/genetlink.h
+++ b/trunk/include/linux/genetlink.h
@@ -80,4 +80,12 @@ enum {
 
 #define CTRL_ATTR_MCAST_GRP_MAX (__CTRL_ATTR_MCAST_GRP_MAX - 1)
 
+#ifdef __KERNEL__
+
+/* All generic netlink requests are serialized by a global lock.  */
+extern void genl_lock(void);
+extern void genl_unlock(void);
+
+#endif /* __KERNEL__ */
+
 #endif	/* __LINUX_GENERIC_NETLINK_H */
diff --git a/trunk/net/netlink/genetlink.c b/trunk/net/netlink/genetlink.c
index a4b6e148c5de..a28fda7420d9 100644
--- a/trunk/net/netlink/genetlink.c
+++ b/trunk/net/netlink/genetlink.c
@@ -20,15 +20,17 @@
 
 static DEFINE_MUTEX(genl_mutex); /* serialization of message processing */
 
-static inline void genl_lock(void)
+void genl_lock(void)
 {
 	mutex_lock(&genl_mutex);
 }
+EXPORT_SYMBOL(genl_lock);
 
-static inline void genl_unlock(void)
+void genl_unlock(void)
 {
 	mutex_unlock(&genl_mutex);
 }
+EXPORT_SYMBOL(genl_unlock);
 
 #define GENL_FAM_TAB_SIZE	16
 #define GENL_FAM_TAB_MASK	(GENL_FAM_TAB_SIZE - 1)