git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge to Fedora kernel-2.6.18-1.2224_FC5 patched with stable patch-2.6.18.1-vs2.0...
[linux-2.6.git]
/
net
/
tipc
/
user_reg.c
diff --git
a/net/tipc/user_reg.c
b/net/tipc/user_reg.c
index
3f3f933
..
04d1b9b
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 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)
/**
* reg_init - create TIPC user registry (but don't activate it)
@@
-82,9
+82,8
@@
static int reg_init(void)
spin_lock_bh(®_lock);
if (!users) {
spin_lock_bh(®_lock);
if (!users) {
- users =
(struct tipc_user *)km
alloc(USER_LIST_SIZE, GFP_ATOMIC);
+ users =
kz
alloc(USER_LIST_SIZE, GFP_ATOMIC);
if (users) {
if (users) {
- memset(users, 0, USER_LIST_SIZE);
for (i = 1; i <= MAX_USERID; i++) {
users[i].next = i - 1;
}
for (i = 1; i <= MAX_USERID; i++) {
users[i].next = i - 1;
}