diff -NurpP --minimal linux-3.7.1-vs2.3.5.4/include/linux/vs_inet.h linux-3.7.1-vs2.3.5.5/include/linux/vs_inet.h
--- linux-3.7.1-vs2.3.5.4/include/linux/vs_inet.h	2013-01-04 22:27:45.000000000 +0000
+++ linux-3.7.1-vs2.3.5.5/include/linux/vs_inet.h	2013-01-04 23:27:50.000000000 +0000
@@ -59,7 +59,7 @@ static inline
 int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask)
 {
 	struct nx_addr_v4 *nxa;
-	unsigned long flags;
+	unsigned long irqflags;
 	int ret = 1;
 
 	if (!nxi)
@@ -84,13 +84,13 @@ int v4_addr_in_nx_info(struct nx_info *n
 	ret = 5;
 
 	/* check for v4 addresses */
-	spin_lock_irqsave(&nxi->addr_lock, flags);
+	spin_lock_irqsave(&nxi->addr_lock, irqflags);
 	for (nxa = &nxi->v4; nxa; nxa = nxa->next)
 		if (v4_addr_match(nxa, addr, tmask))
 			goto out_unlock;
 	ret = 0;
 out_unlock:
-	spin_unlock_irqrestore(&nxi->addr_lock, flags);
+	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
 out:
 	vxdprintk(VXD_CBIT(net, 0),
 		"v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d",
@@ -109,16 +109,16 @@ static inline
 int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask)
 {
 	struct nx_addr_v4 *ptr;
-	unsigned long flags;
+	unsigned long irqflags;
 	int ret = 1;
 
-	spin_lock_irqsave(&nxi->addr_lock, flags);
+	spin_lock_irqsave(&nxi->addr_lock, irqflags);
 	for (ptr = &nxi->v4; ptr; ptr = ptr->next)
 		if (v4_nx_addr_match(ptr, nxa, mask))
 			goto out_unlock;
 	ret = 0;
 out_unlock:
-	spin_unlock_irqrestore(&nxi->addr_lock, flags);
+	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
 	return ret;
 }
 
diff -NurpP --minimal linux-3.7.1-vs2.3.5.4/include/linux/vs_inet6.h linux-3.7.1-vs2.3.5.5/include/linux/vs_inet6.h
--- linux-3.7.1-vs2.3.5.4/include/linux/vs_inet6.h	2013-01-04 22:28:58.000000000 +0000
+++ linux-3.7.1-vs2.3.5.5/include/linux/vs_inet6.h	2013-01-04 23:27:50.000000000 +0000
@@ -41,19 +41,19 @@ int v6_addr_in_nx_info(struct nx_info *n
 	const struct in6_addr *addr, uint16_t mask)
 {
 	struct nx_addr_v6 *nxa;
-	unsigned long flags;
+	unsigned long irqflags;
 	int ret = 1;
 
 	if (!nxi)
 		goto out;
 
-	spin_lock_irqsave(&nxi->addr_lock, flags);
+	spin_lock_irqsave(&nxi->addr_lock, irqflags);
 	for (nxa = &nxi->v6; nxa; nxa = nxa->next)
 		if (v6_addr_match(nxa, addr, mask))
 			goto out_unlock;
 	ret = 0;
 out_unlock:
-	spin_unlock_irqrestore(&nxi->addr_lock, flags);
+	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
 out:
 	vxdprintk(VXD_CBIT(net, 0),
 		"v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d",
@@ -72,16 +72,16 @@ static inline
 int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask)
 {
 	struct nx_addr_v6 *ptr;
-	unsigned long flags;
+	unsigned long irqflags;
 	int ret = 1;
 
-	spin_lock_irqsave(&nxi->addr_lock, flags);
+	spin_lock_irqsave(&nxi->addr_lock, irqflags);
 	for (ptr = &nxi->v6; ptr; ptr = ptr->next)
 		if (v6_nx_addr_match(ptr, nxa, mask))
 			goto out_unlock;
 	ret = 0;
 out_unlock:
-	spin_unlock_irqrestore(&nxi->addr_lock, flags);
+	spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
 	return ret;
 }
 
diff -NurpP --minimal linux-3.7.1-vs2.3.5.4/kernel/vserver/inet.c linux-3.7.1-vs2.3.5.5/kernel/vserver/inet.c
--- linux-3.7.1-vs2.3.5.4/kernel/vserver/inet.c	2013-01-04 23:06:14.000000000 +0000
+++ linux-3.7.1-vs2.3.5.5/kernel/vserver/inet.c	2013-01-11 13:43:00.000000000 +0000
@@ -171,7 +167,7 @@ struct rtable *ip_v4_find_src(struct net
 
 	if (fl4->saddr == INADDR_ANY) {
 		struct nx_addr_v4 *ptr;
-		unsigned long flags;
+		unsigned long irqflags;
 		__be32 found = 0;
 
 		rt = __ip_route_output_key(net, fl4);
@@ -185,7 +181,7 @@ struct rtable *ip_v4_find_src(struct net
 				goto found;
 		}
 
-		spin_lock_irqsave(&nxi->addr_lock, flags);
+		spin_lock_irqsave(&nxi->addr_lock, irqflags);
 		for (ptr = &nxi->v4; ptr; ptr = ptr->next) {
 			__be32 primary = ptr->ip[0].s_addr;
 			__be32 mask = ptr->mask.s_addr;
@@ -214,7 +210,7 @@ struct rtable *ip_v4_find_src(struct net
 		found = ipv4_is_loopback(fl4->daddr)
 			? IPI_LOOPBACK : nxi->v4.ip[0].s_addr;
 	found_unlock:
-		spin_unlock_irqrestore(&nxi->addr_lock, flags);
+		spin_unlock_irqrestore(&nxi->addr_lock, irqflags);
 	found:
 		/* assign src ip to flow */
 		fl4->saddr = found;