diff -NurpP linux-2.6.22.9-vs2.3.0.25.2/kernel/fork.c linux-2.6.22.9-vs2.3.0.25.3/kernel/fork.c
--- linux-2.6.22.9-vs2.3.0.25.2/kernel/fork.c	2007-10-01 12:00:55 +0200
+++ linux-2.6.22.9-vs2.3.0.25.3/kernel/fork.c	2007-10-01 13:21:00 +0200
@@ -1017,6 +1017,7 @@ static struct task_struct *copy_process(
 	DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled);
 	DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled);
 #endif
+	__get_xid_task(current->vx_info ? current->vx_info->vx_id : 0);
 	init_vx_info(&p->vx_info, current->vx_info);
 	init_nx_info(&p->nx_info, current->nx_info);
 
diff -NurpP linux-2.6.22.9-vs2.3.0.25.2/kernel/vserver/inet.c linux-2.6.22.9-vs2.3.0.25.3/kernel/vserver/inet.c
--- linux-2.6.22.9-vs2.3.0.25.2/kernel/vserver/inet.c	2007-09-23 14:13:31 +0200
+++ linux-2.6.22.9-vs2.3.0.25.3/kernel/vserver/inet.c	2007-10-01 13:10:13 +0200
@@ -1,6 +1,6 @@
 
-#include <linux/vserver/debug.h>
 #include <linux/vs_inet6.h>
+#include <linux/vserver/debug.h>
 #include <net/route.h>
 #include <net/addrconf.h>