backing out to version 208 of util-vserver

[util-vserver.git] / kernel / switch.h

diff --git a/kernel/switch.h b/kernel/switch.h
index 672ed15..0c7fddb 100644 (file)
--- a/kernel/switch.h
+++ b/kernel/switch.h
@@ -3,7 +3,6 @@
 
 #include <linux/types.h>
 
-
 #define VC_CATEGORY(c)         (((c) >> 24) & 0x3F)
 #define VC_COMMAND(c)          (((c) >> 16) & 0xFF)
 #define VC_VERSION(c)          ((c) & 0xFFF)
@@ -34,7 +33,7 @@
   DISK   |       |       |       |       |DLIMIT |       | |INODE  |       |
   VFS    |     32|     33|     34|     35|     36|     37| |     38|     39|
   -------+-------+-------+-------+-------+-------+-------+ +-------+-------+
-  OTHER  |VSTAT  |       |       |       |       |       | |VINFO  |       |
+  OTHER  |       |       |       |       |       |       | |VINFO  |       |
         |     40|     41|     42|     43|     44|     45| |     46|     47|
   =======+=======+=======+=======+=======+=======+=======+ +=======+=======+
   SPECIAL|EVENT  |       |       |       |FLAGS  |       | |       |       |
@@ -66,7 +65,6 @@
 #define VC_CAT_DLIMIT          36
 #define VC_CAT_INODE           38
 
-#define VC_CAT_VSTAT           40
 #define VC_CAT_VINFO           46
 #define VC_CAT_EVENT           48
 
@@ -79,15 +77,21 @@
 
 /*  interface version */
 
-#define VCI_VERSION            0x00020102
+#define VCI_VERSION            0x00020001
 #define VCI_LEGACY_VERSION     0x000100FF
 
 /*  query version */
 
 #define VCMD_get_version       VC_CMD(VERSION, 0, 0)
-#define VCMD_get_vci           VC_CMD(VERSION, 1, 0)
 
 
+#ifdef __KERNEL__
+
+#include <linux/errno.h>
+
+
+#else  /* __KERNEL__ */
 #define __user
+#endif /* __KERNEL__ */
 
 #endif /* _VX_SWITCH_H */