diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/context.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/context.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/context.h 2006-01-21 18:28:01 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/context.h 2006-01-27 20:36:32 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_CONTEXT_H #define _VX_CONTEXT_H +#include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/cvirt.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/cvirt.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/cvirt.h 2006-01-21 18:28:04 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/cvirt.h 2006-01-27 20:36:21 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_CVIRT_H #define _VX_CVIRT_H + #ifdef __KERNEL__ struct timespec; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/cvirt_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/cvirt_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/cvirt_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/cvirt_cmd.h 2006-01-27 20:36:11 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_CVIRT_CMD_H #define _VX_CVIRT_CMD_H + /* virtual host info name commands */ #define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/cvirt_def.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/cvirt_def.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/cvirt_def.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/cvirt_def.h 2006-01-27 20:35:10 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_CVIRT_DEF_H #define _VX_CVIRT_DEF_H +#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/debug.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/debug.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/debug.h 2006-01-25 06:07:00 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/debug.h 2006-01-27 20:35:35 +0100 @@ -1,9 +1,8 @@ #ifndef _VX_DEBUG_H #define _VX_DEBUG_H -#ifndef CONFIG_VSERVER -#warning config options missing -#endif +#include + #define VXD_CBIT(n,m) (vx_debug_ ## n & (1 << (m))) #define VXD_CMIN(n,m) (vx_debug_ ## n > (m)) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/dlimit_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/dlimit_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/dlimit_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/dlimit_cmd.h 2006-01-27 20:37:42 +0100 @@ -1,6 +1,9 @@ #ifndef _VX_DLIMIT_CMD_H #define _VX_DLIMIT_CMD_H +#include + + /* dlimit vserver commands */ #define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/global.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/global.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/global.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/global.h 2006-01-27 20:38:03 +0100 @@ -1,10 +1,6 @@ #ifndef _VX_GLOBAL_H #define _VX_GLOBAL_H -#ifndef CONFIG_VSERVER -#warning config options missing -#endif - extern atomic_t vx_global_ctotal; extern atomic_t vx_global_cactive; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/inode.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/inode.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/inode.h 2006-01-25 05:34:51 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/inode.h 2006-01-27 20:38:52 +0100 @@ -15,9 +15,8 @@ #ifdef __KERNEL__ -#ifndef CONFIG_VSERVER -#warning config options missing -#endif +#include + #ifdef CONFIG_VSERVER_PROC_SECURE #define IATTR_PROC_DEFAULT ( IATTR_ADMIN | IATTR_HIDE ) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/inode_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/inode_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/inode_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/inode_cmd.h 2006-01-27 20:39:25 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_INODE_CMD_H #define _VX_INODE_CMD_H + /* inode vserver commands */ #define VCMD_get_iattr_v0 VC_CMD(INODE, 1, 0) @@ -27,6 +28,9 @@ struct vcmd_ctx_iattr_v1 { #ifdef __KERNEL__ +#include + + #ifdef CONFIG_COMPAT struct vcmd_ctx_iattr_v1_x32 { diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/legacy.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/legacy.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/legacy.h 2006-01-21 18:28:14 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/legacy.h 2006-01-27 20:39:43 +0100 @@ -3,6 +3,7 @@ #include "switch.h" + /* compatibiliy vserver commands */ #define VCMD_new_s_context VC_CMD(COMPAT, 1, 1) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/limit_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/limit_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/limit_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/limit_cmd.h 2006-01-27 20:40:26 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_LIMIT_CMD_H #define _VX_LIMIT_CMD_H + /* rlimit vserver commands */ #define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/limit_def.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/limit_def.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/limit_def.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/limit_def.h 2006-01-27 20:40:52 +0100 @@ -1,11 +1,13 @@ #ifndef _VX_LIMIT_DEF_H #define _VX_LIMIT_DEF_H +#include #include #include #include "limit.h" + /* context sub struct */ struct _vx_limit { diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/limit_int.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/limit_int.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/limit_int.h 2006-01-21 18:27:58 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/limit_int.h 2006-01-27 20:41:21 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_LIMIT_INT_H #define _VX_LIMIT_INT_H + #ifdef __KERNEL__ #define VXD_RLIMIT_COND(r) VXD_CBIT(limit, (r)) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/namespace.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/namespace.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/namespace.h 2006-01-21 18:28:03 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/namespace.h 2006-01-27 20:41:31 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_NAMESPACE_H #define _VX_NAMESPACE_H + #include struct vx_info; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/namespace_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/namespace_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/namespace_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/namespace_cmd.h 2006-01-27 20:41:38 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_NAMESPACE_CMD_H #define _VX_NAMESPACE_CMD_H + #define VCMD_enter_namespace VC_CMD(PROCALT, 1, 0) #define VCMD_cleanup_namespace VC_CMD(PROCALT, 2, 0) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/sched.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/sched.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/sched.h 2006-01-21 18:28:08 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/sched.h 2006-01-27 20:42:25 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_SCHED_H #define _VX_SCHED_H + #ifdef __KERNEL__ struct timespec; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/sched_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/sched_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/sched_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/sched_cmd.h 2006-01-27 20:42:39 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_SCHED_CMD_H #define _VX_SCHED_CMD_H + /* sched vserver commands */ #define VCMD_set_sched_v2 VC_CMD(SCHED, 1, 2) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/sched_def.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/sched_def.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/sched_def.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/sched_def.h 2006-01-27 20:43:07 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_SCHED_DEF_H #define _VX_SCHED_DEF_H +#include #include #include #include diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/signal.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/signal.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/signal.h 2006-01-21 18:28:08 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/signal.h 2006-01-27 20:43:18 +0100 @@ -1,8 +1,8 @@ #ifndef _VX_SIGNAL_H #define _VX_SIGNAL_H -#ifdef __KERNEL__ +#ifdef __KERNEL__ struct vx_info; diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/signal_cmd.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/signal_cmd.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/signal_cmd.h 2006-01-21 18:28:15 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/signal_cmd.h 2006-01-27 20:43:27 +0100 @@ -1,6 +1,7 @@ #ifndef _VX_SIGNAL_CMD_H #define _VX_SIGNAL_CMD_H + /* signalling vserver commands */ #define VCMD_ctx_kill VC_CMD(PROCTRL, 1, 0) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/switch.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/switch.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/switch.h 2006-01-21 18:28:01 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/switch.h 2006-01-27 20:43:46 +0100 @@ -3,6 +3,7 @@ #include + #define VC_CATEGORY(c) (((c) >> 24) & 0x3F) #define VC_COMMAND(c) (((c) >> 16) & 0xFF) #define VC_VERSION(c) ((c) & 0xFFF) diff -NurpP --minimal linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/tag.h linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/tag.h --- linux-2.6.16-rc1-vs2.1.0.7/include/linux/vserver/tag.h 2006-01-25 06:15:45 +0100 +++ linux-2.6.16-rc1-vs2.1.0.7.1/include/linux/vserver/tag.h 2006-01-27 20:44:12 +0100 @@ -1,9 +1,8 @@ #ifndef _DX_TAG_H #define _DX_TAG_H -#ifndef CONFIG_VSERVER -#warning config options missing -#endif +#include + #define DX_TAG(in) (IS_TAGGED(in))