diff -NurpP --minimal linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/context.c linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/context.c
--- linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/context.c	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/context.c	2011-06-10 23:20:56.000000000 +0200
@@ -60,7 +60,7 @@ atomic_t vx_global_cactive	= ATOMIC_INIT
 
 static struct hlist_head vx_info_inactive = HLIST_HEAD_INIT;
 
-static spinlock_t vx_info_inactive_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(vx_info_inactive_lock);
 
 
 /*	__alloc_vx_info()
@@ -263,7 +263,7 @@ void free_vx_info(struct vx_info *vxi)
 static struct hlist_head vx_info_hash[VX_HASH_SIZE] =
 	{ [0 ... VX_HASH_SIZE-1] = HLIST_HEAD_INIT };
 
-static spinlock_t vx_info_hash_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(vx_info_hash_lock);
 
 
 static inline unsigned int __hashval(xid_t xid)
diff -NurpP --minimal linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/device.c linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/device.c
--- linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/device.c	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/device.c	2011-06-10 23:20:56.000000000 +0200
@@ -44,7 +44,7 @@ struct vs_mapping {
 
 static struct hlist_head dmap_main_hash[1 << DMAP_HASH_BITS];
 
-static spinlock_t dmap_main_hash_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dmap_main_hash_lock);
 
 static struct vx_dmap_target dmap_defaults[2] = {
 	{ .flags = DATTR_OPEN },
diff -NurpP --minimal linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/dlimit.c linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/dlimit.c
--- linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/dlimit.c	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/dlimit.c	2011-06-10 23:20:56.000000000 +0200
@@ -81,7 +81,7 @@ static void __dealloc_dl_info(struct dl_
 
 struct hlist_head dl_info_hash[DL_HASH_SIZE];
 
-static spinlock_t dl_info_hash_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dl_info_hash_lock);
 
 
 static inline unsigned int __hashval(struct super_block *sb, tag_t tag)
diff -NurpP --minimal linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/network.c linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/network.c
--- linux-3.0-rc2-vs2.3.1-pre1/kernel/vserver/network.c	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0-rc2-vs2.3.1-pre1.1/kernel/vserver/network.c	2011-06-10 23:20:56.000000000 +0200
@@ -209,7 +209,7 @@ extern int __nx_inet_del_lback(__be32 ad
 
 struct hlist_head nx_info_hash[NX_HASH_SIZE];
 
-static spinlock_t nx_info_hash_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(nx_info_hash_lock);
 
 
 static inline unsigned int __hashval(nid_t nid)