diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/include/linux/vserver/context_cmd.h linux-2.6.22.2-vs2.3.0.17.1.1/include/linux/vserver/context_cmd.h
--- linux-2.6.22.2-vs2.3.0.17.1/include/linux/vserver/context_cmd.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.1.1/include/linux/vserver/context_cmd.h	2007-08-15 20:06:48 +0200
@@ -7,7 +7,7 @@
 #define VCMD_task_xid		VC_CMD(VINFO, 1, 0)
 
 #ifdef	__KERNEL__
-extern int vc_task_xid(uint32_t, void __user *);
+extern int vc_task_xid(uint32_t);
 
 #endif	/* __KERNEL__ */
 
diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/include/linux/vserver/network_cmd.h linux-2.6.22.2-vs2.3.0.17.1.1/include/linux/vserver/network_cmd.h
--- linux-2.6.22.2-vs2.3.0.17.1/include/linux/vserver/network_cmd.h	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.1.1/include/linux/vserver/network_cmd.h	2007-08-15 20:08:10 +0200
@@ -7,7 +7,7 @@
 #define VCMD_task_nid		VC_CMD(VINFO, 2, 0)
 
 #ifdef	__KERNEL__
-extern int vc_task_nid(uint32_t, void __user *);
+extern int vc_task_nid(uint32_t);
 
 #endif	/* __KERNEL__ */
 
diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/context.c linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/context.c
--- linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/context.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/context.c	2007-08-15 19:25:22 +0200
@@ -713,7 +713,7 @@ void	exit_vx_info_early(struct task_stru
 #include <asm/uaccess.h>
 
 
-int vc_task_xid(uint32_t id, void __user *data)
+int vc_task_xid(uint32_t id)
 {
 	xid_t xid;
 
diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/network.c linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/network.c
--- linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/network.c	2007-08-12 02:15:32 +0200
+++ linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/network.c	2007-08-15 19:25:04 +0200
@@ -511,7 +511,7 @@ void nx_update_persistent(struct nx_info
 #include <asm/uaccess.h>
 
 
-int vc_task_nid(uint32_t id, void __user *data)
+int vc_task_nid(uint32_t id)
 {
 	nid_t nid;
 
diff -NurpP --minimal linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/switch.c linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/switch.c
--- linux-2.6.22.2-vs2.3.0.17.1/kernel/vserver/switch.c	2007-08-05 20:53:13 +0200
+++ linux-2.6.22.2-vs2.3.0.17.1.1/kernel/vserver/switch.c	2007-08-15 21:20:13 +0200
@@ -81,12 +81,12 @@ long do_vcmd(uint32_t cmd, uint32_t id,
 		return vc_get_vci(id);
 
 	case VCMD_task_xid:
-		return vc_task_xid(id, data);
+		return vc_task_xid(id);
 	case VCMD_vx_info:
 		return vc_vx_info(vxi, data);
 
 	case VCMD_task_nid:
-		return vc_task_nid(id, data);
+		return vc_task_nid(id);
 	case VCMD_nx_info:
 		return vc_nx_info(nxi, data);