diff -u linux-3.0-rc7-vs2.3.1-pre3/kernel/vserver/space.c linux-3.0-rc7-vs2.3.1-pre4/kernel/vserver/space.c
--- linux-3.0-rc7-vs2.3.1-pre3/kernel/vserver/space.c	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0-rc7-vs2.3.1-pre4/kernel/vserver/space.c	2011-07-20 02:11:49.000000000 +0200
@@ -44,18 +44,30 @@
 static const struct vcmd_space_mask_v1 space_mask_v0 = {
 	.mask = CLONE_FS |
 		CLONE_NEWNS |
+#ifdef	CONFIG_UTS_NS
 		CLONE_NEWUTS |
+#endif
+#ifdef	CONFIG_IPC_NS
 		CLONE_NEWIPC |
+#endif
+#ifdef	CONFIG_USER_NS
 		CLONE_NEWUSER |
+#endif
 		0
 };
 
 static const struct vcmd_space_mask_v1 space_mask = {
 	.mask = CLONE_FS |
 		CLONE_NEWNS |
+#ifdef	CONFIG_UTS_NS
 		CLONE_NEWUTS |
+#endif
+#ifdef	CONFIG_IPC_NS
 		CLONE_NEWIPC |
+#endif
+#ifdef	CONFIG_USER_NS
 		CLONE_NEWUSER |
+#endif
 #ifdef	CONFIG_PID_NS
 		CLONE_NEWPID |
 #endif
@@ -68,9 +80,15 @@
 static const struct vcmd_space_mask_v1 default_space_mask = {
 	.mask = CLONE_FS |
 		CLONE_NEWNS |
+#ifdef	CONFIG_UTS_NS
 		CLONE_NEWUTS |
+#endif
+#ifdef	CONFIG_IPC_NS
 		CLONE_NEWIPC |
+#endif
+#ifdef	CONFIG_USER_NS
 		CLONE_NEWUSER |
+#endif
 #ifdef	CONFIG_PID_NS
 //		CLONE_NEWPID |
 #endif