diff -NurpP linux-2.6.14.2-vs2.1.0-rc7.1/include/linux/vserver/dlimit.h linux-2.6.14.2-vs2.1.0-rc7.2/include/linux/vserver/dlimit.h --- linux-2.6.14.2-vs2.1.0-rc7.1/include/linux/vserver/dlimit.h 2005-10-29 04:45:24 +0200 +++ linux-2.6.14.2-vs2.1.0-rc7.2/include/linux/vserver/dlimit.h 2005-11-16 15:59:38 +0100 @@ -3,13 +3,15 @@ #include "switch.h" -#define CDLIM_UNSET (0ULL) -#define CDLIM_INFINITY (~0ULL) -#define CDLIM_KEEP (~1ULL) - #ifdef __KERNEL__ +/* keep in sync with CDLIM_* */ + +#define DLIM_UNSET (0ULL) +#define DLIM_INFINITY (~0ULL) +#define DLIM_KEEP (~1ULL) + #include struct super_block; diff -NurpP linux-2.6.14.2-vs2.1.0-rc7.1/include/linux/vserver/dlimit_cmd.h linux-2.6.14.2-vs2.1.0-rc7.2/include/linux/vserver/dlimit_cmd.h --- linux-2.6.14.2-vs2.1.0-rc7.1/include/linux/vserver/dlimit_cmd.h 2005-10-29 03:19:03 +0200 +++ linux-2.6.14.2-vs2.1.0-rc7.2/include/linux/vserver/dlimit_cmd.h 2005-11-16 15:59:33 +0100 @@ -24,6 +24,9 @@ struct vcmd_ctx_dlimit_v0 { uint32_t flags; }; +#define CDLIM_UNSET (0UL) +#define CDLIM_INFINITY (~0UL) +#define CDLIM_KEEP (~1UL) #ifdef __KERNEL__