Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

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

diff --git a/net/tipc/net.c b/net/tipc/net.c
index a991bf8..f7c8223 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.
 */
 
-DEFINE_RWLOCK(tipc_net_lock);
+rwlock_t tipc_net_lock = RW_LOCK_UNLOCKED;
 struct network tipc_net = { NULL };
 
 struct node *tipc_net_select_remote_node(u32 addr, u32 ref) 
@@ -160,11 +160,14 @@ void tipc_net_send_external_routes(u32 dest)
 
 static int net_init(void)
 {
+       u32 sz = sizeof(struct _zone *) * (tipc_max_zones + 1);
+
        memset(&tipc_net, 0, sizeof(tipc_net));
-       tipc_net.zones = kcalloc(tipc_max_zones + 1, sizeof(struct _zone *), GFP_ATOMIC);
+       tipc_net.zones = (struct _zone **)kmalloc(sz, GFP_ATOMIC);
        if (!tipc_net.zones) {
                return -ENOMEM;
        }
+       memset(tipc_net.zones, 0, sz);
        return TIPC_OK;
 }