--- linux-2.6.20.14-vs2.2.0.0.7.2/kernel/vserver/cacct_init.h	2007-06-24 21:38:25 +0200
+++ linux-2.6.20.14-vs2.2.0.0.7.2/kernel/vserver/cacct_init.h	2007-06-24 21:38:25 +0200
@@ -7,8 +7,8 @@
 
 	for (i = 0; i < VXA_SOCK_SIZE; i++) {
 		for (j = 0; j < 3; j++) {
-			atomic_set(&cacct->sock[i][j].count, 0);
-			atomic_set(&cacct->sock[i][j].total, 0);
+			atomic_long_set(&cacct->sock[i][j].count, 0);
+			atomic_long_set(&cacct->sock[i][j].total, 0);
 		}
 	}
 	for (i = 0; i < 2; i++) {
--- linux-2.6.20.14-vs2.2.0.0.7/include/linux/vs_socket.h	2007-06-13 17:21:27 +0200
+++ linux-2.6.20.14-vs2.2.0.0.7.2/include/linux/vs_socket.h	2007-06-24 18:49:58 +0200
@@ -33,7 +33,7 @@ static inline int vx_sock_type(int famil
 	__vx_acc_sock(v, f, p, s, __FILE__, __LINE__)
 
 static inline void __vx_acc_sock(struct vx_info *vxi,
-	int family, int pos, int size, char *file, int line)
+	int family, int pos, int size, char *_file, int _line)
 {
 	if (vxi) {
 		int type = vx_sock_type(family);