Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-serial

[linux-2.6] / net / tipc / net.c

diff --git a/net/tipc/net.c b/net/tipc/net.c
index f7c8223ddf7dd0f3e9ce9c148e2cca1d1915cb3f..e5a359ab49308025f10a1c065cfffa23e7991a5f 100644 (file)
--- a/net/tipc/net.c
+++ b/net/tipc/net.c
@@ -115,7 +115,7 @@
  *     - A local spin_lock protecting the queue of subscriber events.
 */
 
-rwlock_t tipc_net_lock = RW_LOCK_UNLOCKED;
+DEFINE_RWLOCK(tipc_net_lock);
 struct network tipc_net = { NULL };
 
 struct node *tipc_net_select_remote_node(u32 addr, u32 ref)