diff -NurpP --minimal linux-2.6.20.15-vs2.2.0.2/kernel/vserver/context.c linux-2.6.20.15-vs2.2.0.2.1/kernel/vserver/context.c
--- linux-2.6.20.15-vs2.2.0.2/kernel/vserver/context.c	2007-06-14 19:18:42 +0200
+++ linux-2.6.20.15-vs2.2.0.2.1/kernel/vserver/context.c	2007-07-19 06:29:55 +0200
@@ -951,7 +951,7 @@ int vc_get_cflags(struct vx_info *vxi, v
 	vc_data.flagword = vxi->vx_flags;
 
 	/* special STATE flag handling */
-	vc_data.mask = vs_mask_flags(~0UL, vxi->vx_flags, VXF_ONE_TIME);
+	vc_data.mask = vs_mask_flags(~0ULL, vxi->vx_flags, VXF_ONE_TIME);
 
 	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
@@ -1011,7 +1011,7 @@ int vc_get_ccaps_v0(struct vx_info *vxi,
 	ret = do_get_caps(vxi, &vc_data.bcaps, &vc_data.ccaps);
 	if (ret)
 		return ret;
-	vc_data.cmask = ~0UL;
+	vc_data.cmask = ~0ULL;
 
 	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
@@ -1026,7 +1026,7 @@ int vc_get_ccaps(struct vx_info *vxi, vo
 	ret = do_get_caps(vxi, NULL, &vc_data.ccaps);
 	if (ret)
 		return ret;
-	vc_data.cmask = ~0UL;
+	vc_data.cmask = ~0ULL;
 
 	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
@@ -1072,7 +1072,7 @@ int vc_get_bcaps(struct vx_info *vxi, vo
 	ret = do_get_caps(vxi, &vc_data.bcaps, NULL);
 	if (ret)
 		return ret;
-	vc_data.bmask = ~0UL;
+	vc_data.bmask = ~0ULL;
 
 	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
diff -NurpP --minimal linux-2.6.20.15-vs2.2.0.2/kernel/vserver/network.c linux-2.6.20.15-vs2.2.0.2.1/kernel/vserver/network.c
--- linux-2.6.20.15-vs2.2.0.2/kernel/vserver/network.c	2007-06-14 18:21:10 +0200
+++ linux-2.6.20.15-vs2.2.0.2.1/kernel/vserver/network.c	2007-07-19 06:30:38 +0200
@@ -712,7 +712,7 @@ int vc_get_nflags(struct nx_info *nxi, v
 	vc_data.flagword = nxi->nx_flags;
 
 	/* special STATE flag handling */
-	vc_data.mask = vs_mask_flags(~0UL, nxi->nx_flags, NXF_ONE_TIME);
+	vc_data.mask = vs_mask_flags(~0ULL, nxi->nx_flags, NXF_ONE_TIME);
 
 	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;
@@ -744,7 +744,7 @@ int vc_get_ncaps(struct nx_info *nxi, vo
 	struct vcmd_net_caps_v0 vc_data;
 
 	vc_data.ncaps = nxi->nx_ncaps;
-	vc_data.cmask = ~0UL;
+	vc_data.cmask = ~0ULL;
 
 	if (copy_to_user(data, &vc_data, sizeof(vc_data)))
 		return -EFAULT;