X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvserver%2Fnamespace.h;h=fb6cdd1d17cad3dfa1dfa48be827c8144199b04a;hb=43bc926fffd92024b46cafaf7350d669ba9ca884;hp=140fc79f220ffc0698909a9b32e83056142ac091;hpb=b76fcd5f0c655b6e3e9bf534594357025421c66a;p=linux-2.6.git

diff --git a/include/linux/vserver/namespace.h b/include/linux/vserver/namespace.h
index 140fc79f2..fb6cdd1d1 100644
--- a/include/linux/vserver/namespace.h
+++ b/include/linux/vserver/namespace.h
@@ -1,45 +1,8 @@
 #ifndef _VX_NAMESPACE_H
 #define _VX_NAMESPACE_H
 
-#include <linux/types.h>
-
-	
-/* virtual host info names */
-
-#define VCMD_vx_set_vhi_name	VC_CMD(VHOST, 1, 0)
-#define VCMD_vx_get_vhi_name	VC_CMD(VHOST, 2, 0)
-
-struct  vcmd_vx_vhi_name_v0 {
-	uint32_t field;
-	char name[65];
-};
-
-
-enum vx_vhi_name_field {
-	VHIN_CONTEXT=0,
-	VHIN_SYSNAME,
-	VHIN_NODENAME,
-	VHIN_RELEASE,
-	VHIN_VERSION,
-	VHIN_MACHINE,
-	VHIN_DOMAINNAME,
-};
-
 
-#ifdef	__KERNEL__
-
-#include <linux/compiler.h>
-
-extern int vc_set_vhi_name(uint32_t, void __user *);
-extern int vc_get_vhi_name(uint32_t, void __user *);
-
-#endif	/* __KERNEL__ */
-
-#define VCMD_enter_namespace	VC_CMD(PROCALT, 1, 0)
-#define VCMD_cleanup_namespace	VC_CMD(PROCALT, 2, 0)
-#define VCMD_set_namespace	VC_CMD(PROCALT, 3, 0)
-
-#ifdef	__KERNEL__
+#include <linux/types.h>
 
 struct vx_info;
 struct namespace;
@@ -47,9 +10,6 @@ struct fs_struct;
 
 extern int vx_set_namespace(struct vx_info *, struct namespace *, struct fs_struct *);
 
-extern int vc_enter_namespace(uint32_t, void __user *);
-extern int vc_cleanup_namespace(uint32_t, void __user *);
-extern int vc_set_namespace(uint32_t, void __user *);
-
-#endif	/* __KERNEL__ */
+#else	/* _VX_NAMESPACE_H */
+#warning duplicate inclusion
 #endif	/* _VX_NAMESPACE_H */