diff -NurpP --minimal linux-2.6.33-vs2.3.0.36.30.2/kernel/signal.c linux-2.6.33-vs2.3.0.36.30.3/kernel/signal.c
--- linux-2.6.33-vs2.3.0.36.30.2/kernel/signal.c	2010-02-25 13:10:38.000000000 +0100
+++ linux-2.6.33-vs2.3.0.36.30.3/kernel/signal.c	2010-03-10 20:32:43.000000000 +0100
@@ -683,7 +683,7 @@ static int check_kill_permission(int sig
 			sig, info, t, vx_task_xid(t), t->pid, current->xid);
 		return error;
 	}
-skip:
+/* skip: */
 	return security_task_kill(t, info, sig, 0);
 }
 
diff -NurpP --minimal linux-2.6.33-vs2.3.0.36.30.2/kernel/vserver/context.c linux-2.6.33-vs2.3.0.36.30.3/kernel/vserver/context.c
--- linux-2.6.33-vs2.3.0.36.30.2/kernel/vserver/context.c	2010-02-25 12:02:16.000000000 +0100
+++ linux-2.6.33-vs2.3.0.36.30.3/kernel/vserver/context.c	2010-03-10 20:35:53.000000000 +0100
@@ -145,9 +145,10 @@ error:
 
 static void __dealloc_vx_info(struct vx_info *vxi)
 {
+#ifdef	CONFIG_VSERVER_WARN
 	struct vx_info_save vxis;
 	int cpu;
-
+#endif
 	vxdprintk(VXD_CBIT(xid, 0),
 		"dealloc_vx_info(%p)", vxi);
 	vxh_dealloc_vx_info(vxi);