diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6.4/include/linux/vserver/switch.h linux-2.6.19.1-vs2.2.0-rc6.5/include/linux/vserver/switch.h --- linux-2.6.19.1-vs2.2.0-rc6.4/include/linux/vserver/switch.h 2006-11-08 04:57:42 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.5/include/linux/vserver/switch.h 2007-01-10 17:31:16 +0100 @@ -77,11 +77,6 @@ #define VC_CAT_SYSTEST 61 #define VC_CAT_COMPAT 63 -/* interface version */ - -#define VCI_VERSION 0x00020102 -#define VCI_LEGACY_VERSION 0x000100FF - /* query version */ #define VCMD_get_version VC_CMD(VERSION, 0, 0) diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6.4/kernel/vserver/switch.c linux-2.6.19.1-vs2.2.0-rc6.5/kernel/vserver/switch.c --- linux-2.6.19.1-vs2.2.0-rc6.4/kernel/vserver/switch.c 2007-01-10 17:00:02 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.5/kernel/vserver/switch.c 2007-01-10 17:35:47 +0100 @@ -25,6 +25,8 @@ #include #include +#include "vci_config.h" + static inline int vc_get_version(uint32_t id) { @@ -35,8 +37,6 @@ int vc_get_version(uint32_t id) return VCI_VERSION; } -#include "vci_config.h" - static inline int vc_get_vci(uint32_t id) { diff -NurpP --minimal linux-2.6.19.1-vs2.2.0-rc6.4/kernel/vserver/vci_config.h linux-2.6.19.1-vs2.2.0-rc6.5/kernel/vserver/vci_config.h --- linux-2.6.19.1-vs2.2.0-rc6.4/kernel/vserver/vci_config.h 2006-12-09 03:51:07 +0100 +++ linux-2.6.19.1-vs2.2.0-rc6.5/kernel/vserver/vci_config.h 2007-01-10 17:35:20 +0100 @@ -1,4 +1,10 @@ +/* interface version */ + +#define VCI_VERSION 0x00020200 +#define VCI_LEGACY_VERSION 0x000100FF + + enum { VCI_KCBIT_NO_DYNAMIC = 0, VCI_KCBIT_LEGACY = 1,