Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

[linux-2.6-omap-h63xx.git] / net / tipc / user_reg.c

diff --git a/net/tipc/user_reg.c b/net/tipc/user_reg.c
index 3f3f933976e9dc27603cff2deec0b74150faebc4..1e3ae57c722872f2e2d74d28891ecb39d53d0f21 100644 (file)
--- 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 spinlock_t reg_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(reg_lock);
 
 /**
  * reg_init - create TIPC user registry (but don't activate it)