diff -NurpP --minimal linux-3.0.7-vs2.3.1/include/linux/vserver/context.h linux-3.0.7-vs2.3.1.1/include/linux/vserver/context.h
--- linux-3.0.7-vs2.3.1/include/linux/vserver/context.h	2011-08-01 18:23:13.000000000 +0200
+++ linux-3.0.7-vs2.3.1.1/include/linux/vserver/context.h	2011-10-27 13:59:29.000000000 +0200
@@ -55,8 +55,6 @@
 
 /* context caps */
 
-#define VXC_CAP_MASK		0x00000000
-
 #define VXC_SET_UTSNAME		0x00000001
 #define VXC_SET_RLIMIT		0x00000002
 #define VXC_FS_SECURITY		0x00000004
diff -NurpP --minimal linux-3.0.7-vs2.3.1/include/linux/vserver/debug.h linux-3.0.7-vs2.3.1.1/include/linux/vserver/debug.h
--- linux-3.0.7-vs2.3.1/include/linux/vserver/debug.h	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0.7-vs2.3.1.1/include/linux/vserver/debug.h	2011-10-27 15:14:51.000000000 +0200
@@ -2,9 +2,9 @@
 #define _VX_DEBUG_H
 
 
-#define VXD_CBIT(n, m)	(vx_debug_ ## n & (1 << (m)))
-#define VXD_CMIN(n, m)	(vx_debug_ ## n > (m))
-#define VXD_MASK(n, m)	(vx_debug_ ## n & (m))
+#define VXD_CBIT(n, m)	(vs_debug_ ## n & (1 << (m)))
+#define VXD_CMIN(n, m)	(vs_debug_ ## n > (m))
+#define VXD_MASK(n, m)	(vs_debug_ ## n & (m))
 
 #define VXD_DEV(d)	(d), (d)->bd_inode->i_ino,		\
 			imajor((d)->bd_inode), iminor((d)->bd_inode)
@@ -34,18 +34,19 @@
 
 #ifdef	CONFIG_VSERVER_DEBUG
 
-extern unsigned int vx_debug_switch;
-extern unsigned int vx_debug_xid;
-extern unsigned int vx_debug_nid;
-extern unsigned int vx_debug_tag;
-extern unsigned int vx_debug_net;
-extern unsigned int vx_debug_limit;
-extern unsigned int vx_debug_cres;
-extern unsigned int vx_debug_dlim;
-extern unsigned int vx_debug_quota;
-extern unsigned int vx_debug_cvirt;
-extern unsigned int vx_debug_space;
-extern unsigned int vx_debug_misc;
+extern unsigned int vs_debug_switch;
+extern unsigned int vs_debug_xid;
+extern unsigned int vs_debug_nid;
+extern unsigned int vs_debug_tag;
+extern unsigned int vs_debug_net;
+extern unsigned int vs_debug_limit;
+extern unsigned int vs_debug_cres;
+extern unsigned int vs_debug_dlim;
+extern unsigned int vs_debug_quota;
+extern unsigned int vs_debug_cvirt;
+extern unsigned int vs_debug_space;
+extern unsigned int vs_debug_perm;
+extern unsigned int vs_debug_misc;
 
 
 #define VX_LOGLEVEL	"vxD: "
@@ -79,15 +80,17 @@ void dump_vx_info_inactive(int);
 
 #else	/* CONFIG_VSERVER_DEBUG */
 
-#define vx_debug_switch 0
-#define vx_debug_xid	0
-#define vx_debug_nid	0
-#define vx_debug_tag	0
-#define vx_debug_net	0
-#define vx_debug_limit	0
-#define vx_debug_cres	0
-#define vx_debug_dlim	0
-#define vx_debug_cvirt	0
+/*
+#define vs_debug_switch 0
+#define vs_debug_xid	0
+#define vs_debug_nid	0
+#define vs_debug_tag	0
+#define vs_debug_net	0
+#define vs_debug_limit	0
+#define vs_debug_cres	0
+#define vs_debug_dlim	0
+#define vs_debug_cvirt	0
+*/
 
 #define vxdprintk(x...) do { } while (0)
 #define vxlprintk(x...) do { } while (0)
diff -NurpP --minimal linux-3.0.7-vs2.3.1/kernel/vserver/sysctl.c linux-3.0.7-vs2.3.1.1/kernel/vserver/sysctl.c
--- linux-3.0.7-vs2.3.1/kernel/vserver/sysctl.c	2011-06-10 22:11:24.000000000 +0200
+++ linux-3.0.7-vs2.3.1.1/kernel/vserver/sysctl.c	2011-10-27 15:18:40.000000000 +0200
@@ -28,22 +28,24 @@ enum {
 	CTL_DEBUG_QUOTA,
 	CTL_DEBUG_CVIRT,
 	CTL_DEBUG_SPACE,
+	CTL_DEBUG_PERM,
 	CTL_DEBUG_MISC,
 };
 
 
-unsigned int vx_debug_switch	= 0;
-unsigned int vx_debug_xid	= 0;
-unsigned int vx_debug_nid	= 0;
-unsigned int vx_debug_tag	= 0;
-unsigned int vx_debug_net	= 0;
-unsigned int vx_debug_limit	= 0;
-unsigned int vx_debug_cres	= 0;
-unsigned int vx_debug_dlim	= 0;
-unsigned int vx_debug_quota	= 0;
-unsigned int vx_debug_cvirt	= 0;
-unsigned int vx_debug_space	= 0;
-unsigned int vx_debug_misc	= 0;
+unsigned int vs_debug_switch	= 0;
+unsigned int vs_debug_xid	= 0;
+unsigned int vs_debug_nid	= 0;
+unsigned int vs_debug_tag	= 0;
+unsigned int vs_debug_net	= 0;
+unsigned int vs_debug_limit	= 0;
+unsigned int vs_debug_cres	= 0;
+unsigned int vs_debug_dlim	= 0;
+unsigned int vs_debug_quota	= 0;
+unsigned int vs_debug_cvirt	= 0;
+unsigned int vs_debug_space	= 0;
+unsigned int vs_debug_perm	= 0;
+unsigned int vs_debug_misc	= 0;
 
 
 static struct ctl_table_header *vserver_table_header;
@@ -129,7 +131,7 @@ static int zero;
 #define	CTL_ENTRY(ctl, name)				\
 	{						\
 		.procname	= #name,		\
-		.data		= &vx_ ## name,		\
+		.data		= &vs_ ## name,		\
 		.maxlen		= sizeof(int),		\
 		.mode		= 0644,			\
 		.proc_handler	= &proc_dodebug,	\
@@ -149,6 +151,7 @@ static ctl_table vserver_debug_table[] =
 	CTL_ENTRY(CTL_DEBUG_QUOTA,	debug_quota),
 	CTL_ENTRY(CTL_DEBUG_CVIRT,	debug_cvirt),
 	CTL_ENTRY(CTL_DEBUG_SPACE,	debug_space),
+	CTL_ENTRY(CTL_DEBUG_PERM,	debug_perm),
 	CTL_ENTRY(CTL_DEBUG_MISC,	debug_misc),
 	{ 0 }
 };
@@ -175,13 +178,14 @@ static match_table_t tokens = {
 	{ CTL_DEBUG_QUOTA,	"quota=%x"	},
 	{ CTL_DEBUG_CVIRT,	"cvirt=%x"	},
 	{ CTL_DEBUG_SPACE,	"space=%x"	},
+	{ CTL_DEBUG_PERM,	"perm=%x"	},
 	{ CTL_DEBUG_MISC,	"misc=%x"	},
 	{ CTL_DEBUG_ERROR,	NULL		}
 };
 
 #define	HANDLE_CASE(id, name, val)				\
 	case CTL_DEBUG_ ## id:					\
-		vx_debug_ ## name = val;			\
+		vs_debug_ ## name = val;			\
 		printk("vs_debug_" #name "=0x%x\n", val);	\
 		break
 
@@ -214,6 +218,7 @@ static int __init vs_debug_setup(char *s
 		HANDLE_CASE(QUOTA,  quota,  value);
 		HANDLE_CASE(CVIRT,  cvirt,  value);
 		HANDLE_CASE(SPACE,  space,  value);
+		HANDLE_CASE(PERM,   perm,   value);
 		HANDLE_CASE(MISC,   misc,   value);
 		default:
 			return -EINVAL;
@@ -227,15 +232,16 @@ __setup("vsdebug=", vs_debug_setup);
 
 
 
-EXPORT_SYMBOL_GPL(vx_debug_switch);
-EXPORT_SYMBOL_GPL(vx_debug_xid);
-EXPORT_SYMBOL_GPL(vx_debug_nid);
-EXPORT_SYMBOL_GPL(vx_debug_net);
-EXPORT_SYMBOL_GPL(vx_debug_limit);
-EXPORT_SYMBOL_GPL(vx_debug_cres);
-EXPORT_SYMBOL_GPL(vx_debug_dlim);
-EXPORT_SYMBOL_GPL(vx_debug_quota);
-EXPORT_SYMBOL_GPL(vx_debug_cvirt);
-EXPORT_SYMBOL_GPL(vx_debug_space);
-EXPORT_SYMBOL_GPL(vx_debug_misc);
+EXPORT_SYMBOL_GPL(vs_debug_switch);
+EXPORT_SYMBOL_GPL(vs_debug_xid);
+EXPORT_SYMBOL_GPL(vs_debug_nid);
+EXPORT_SYMBOL_GPL(vs_debug_net);
+EXPORT_SYMBOL_GPL(vs_debug_limit);
+EXPORT_SYMBOL_GPL(vs_debug_cres);
+EXPORT_SYMBOL_GPL(vs_debug_dlim);
+EXPORT_SYMBOL_GPL(vs_debug_quota);
+EXPORT_SYMBOL_GPL(vs_debug_cvirt);
+EXPORT_SYMBOL_GPL(vs_debug_space);
+EXPORT_SYMBOL_GPL(vs_debug_perm);
+EXPORT_SYMBOL_GPL(vs_debug_misc);