X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=net%2Ftipc%2Fuser_reg.c;h=3f3f933976e9dc27603cff2deec0b74150faebc4;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=04d1b9be9c5197ccf4ec6c9c9a401985959d50a0;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/net/tipc/user_reg.c b/net/tipc/user_reg.c
index 04d1b9be9..3f3f93397 100644
--- a/net/tipc/user_reg.c
+++ b/net/tipc/user_reg.c
@@ -67,7 +67,7 @@ struct tipc_user {
 
 static struct tipc_user *users = NULL;
 static u32 next_free_user = MAX_USERID + 1;
-static DEFINE_SPINLOCK(reg_lock);
+static spinlock_t reg_lock = SPIN_LOCK_UNLOCKED;
 
 /**
  * reg_init - create TIPC user registry (but don't activate it)
@@ -82,8 +82,9 @@ static int reg_init(void)
 	
 	spin_lock_bh(&reg_lock);
 	if (!users) {
-		users = kzalloc(USER_LIST_SIZE, GFP_ATOMIC);
+		users = (struct tipc_user *)kmalloc(USER_LIST_SIZE, GFP_ATOMIC);
 		if (users) {
+			memset(users, 0, USER_LIST_SIZE);
 			for (i = 1; i <= MAX_USERID; i++) {
 				users[i].next = i - 1;
 			}