--- linux-2.6.16-vs2.1.1-rc14.7/include/linux/vserver/context.h	2006-03-25 04:49:17 +0100
+++ linux-2.6.16-vs2.1.1-rc14.8/include/linux/vserver/context.h	2006-04-01 18:27:05 +0200
@@ -133,7 +133,7 @@ struct vx_info {
 };
 
 #ifndef CONFIG_SMP
 #define	vx_ptr_pc(vxi)		(&(vxi)->info_pc)
-#define	vx_per_cpu(vxi, v, id)	per_cpu_ptr(vx_ptr_pc(vxi), id)->v
+#define	vx_per_cpu(vxi, v, id)	vx_ptr_pc(vxi)->v
 #else
 #define	vx_ptr_pc(vxi)		((vxi)->ptr_pc)
 #define	vx_per_cpu(vxi, v, id)	per_cpu_ptr(vx_ptr_pc(vxi), id)->v