--- linux-2.6.12.2/arch/alpha/mm/init.c	2005-03-02 12:38:18 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/alpha/mm/init.c	2005-07-09 03:54:37 +0200
@@ -20,6 +20,7 @@
 #include <linux/init.h>
 #include <linux/bootmem.h> /* max_low_pfn */
 #include <linux/vmalloc.h>
+#include <linux/pagemap.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.12.2/arch/i386/kernel/sys_i386.c	2004-08-14 12:56:23 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/i386/kernel/sys_i386.c	2005-07-02 22:38:30 +0200
@@ -19,6 +19,7 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.12.2/arch/i386/kernel/traps.c	2005-06-22 02:37:54 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/i386/kernel/traps.c	2005-07-02 22:38:30 +0200
@@ -53,6 +53,7 @@
 
 #include <linux/irq.h>
 #include <linux/module.h>
+#include <linux/vserver/debug.h>
 
 #include "mach_traps.h"
 
--- linux-2.6.12.2/arch/ia64/kernel/perfmon.c	2005-06-22 02:37:54 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/ia64/kernel/perfmon.c	2005-07-02 22:38:30 +0200
@@ -39,6 +39,8 @@
 #include <linux/mount.h>
 #include <linux/version.h>
 #include <linux/bitops.h>
+#include <linux/vs_memory.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/errno.h>
 #include <asm/intrinsics.h>
--- linux-2.6.12.2/arch/ia64/mm/fault.c	2005-06-22 02:37:54 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/ia64/mm/fault.c	2005-07-02 22:38:30 +0200
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
--- linux-2.6.12.2/arch/mips/kernel/syscall.c	2005-06-22 02:37:55 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/mips/kernel/syscall.c	2005-07-02 22:38:30 +0200
@@ -26,6 +26,7 @@
 #include <linux/msg.h>
 #include <linux/shm.h>
 #include <linux/compiler.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/branch.h>
 #include <asm/cachectl.h>
--- linux-2.6.12.2/arch/mips/kernel/sysirix.c	2005-06-22 02:37:55 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/mips/kernel/sysirix.c	2005-07-02 22:38:30 +0200
@@ -30,6 +30,7 @@
 #include <linux/socket.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/ptrace.h>
 #include <asm/page.h>
--- linux-2.6.12.2/arch/ppc/kernel/syscalls.c	2005-06-22 02:37:56 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/ppc/kernel/syscalls.c	2005-07-02 22:38:30 +0200
@@ -36,6 +36,7 @@
 #include <linux/utsname.h>
 #include <linux/file.h>
 #include <linux/unistd.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.12.2/arch/sparc/kernel/sys_sparc.c	2005-06-22 02:37:59 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/sparc/kernel/sys_sparc.c	2005-07-02 22:38:30 +0200
@@ -21,6 +21,7 @@
 #include <linux/utsname.h>
 #include <linux/smp.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.12.2/arch/sparc64/kernel/binfmt_aout32.c	2005-06-22 02:37:59 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/sparc64/kernel/binfmt_aout32.c	2005-07-02 22:38:30 +0200
@@ -27,6 +27,7 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.12.2/arch/sparc64/kernel/sys_sparc.c	2005-03-02 12:38:25 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/sparc64/kernel/sys_sparc.c	2005-07-02 22:38:30 +0200
@@ -25,6 +25,7 @@
 #include <linux/syscalls.h>
 #include <linux/ipc.h>
 #include <linux/personality.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-2.6.12.2/arch/um/kernel/process_kern.c	2005-06-22 02:38:00 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/um/kernel/process_kern.c	2005-07-02 22:38:30 +0200
@@ -22,6 +22,8 @@
 #include "linux/proc_fs.h"
 #include "linux/ptrace.h"
 #include "linux/random.h"
+#include "linux/vs_cvirt.h"
+
 #include "asm/unistd.h"
 #include "asm/mman.h"
 #include "asm/segment.h"
--- linux-2.6.12.2/arch/um/kernel/syscall_kern.c	2005-06-22 02:38:00 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/um/kernel/syscall_kern.c	2005-07-02 22:38:30 +0200
@@ -15,6 +15,8 @@
 #include "linux/unistd.h"
 #include "linux/slab.h"
 #include "linux/utime.h"
+#include <linux/vs_cvirt.h>
+
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "kern_util.h"
--- linux-2.6.12.2/arch/x86_64/ia32/ia32_aout.c	2005-06-22 02:38:01 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/x86_64/ia32/ia32_aout.c	2005-07-02 22:38:30 +0200
@@ -25,6 +25,7 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.12.2/arch/x86_64/kernel/sys_x86_64.c	2005-06-22 02:38:01 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/arch/x86_64/kernel/sys_x86_64.c	2005-07-02 22:38:30 +0200
@@ -16,6 +16,7 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/personality.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ia32.h>
--- linux-2.6.12.2/drivers/char/tty_io.c	2005-06-22 02:38:05 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/drivers/char/tty_io.c	2005-07-02 22:38:30 +0200
@@ -102,6 +102,7 @@
 #include <linux/vt_kern.h>
 #include <linux/selection.h>
 #include <linux/devfs_fs_kernel.h>
+#include <linux/vs_cvirt.h>
 
 #include <linux/kmod.h>
 
--- linux-2.6.12.2/fs/attr.c	2005-06-22 02:38:33 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/attr.c	2005-07-02 22:38:30 +0200
@@ -15,6 +15,9 @@
 #include <linux/quotaops.h>
 #include <linux/security.h>
 #include <linux/time.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
+#include <linux/vserver/debug.h>
 
 /* Taken over from the old code... */
 
--- linux-2.6.12.2/fs/binfmt_aout.c	2005-06-22 02:38:33 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/binfmt_aout.c	2005-07-02 22:38:30 +0200
@@ -24,6 +24,7 @@
 #include <linux/binfmts.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.12.2/fs/binfmt_elf.c	2005-06-22 02:38:33 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/binfmt_elf.c	2005-07-02 22:38:30 +0200
@@ -38,6 +38,7 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/random.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/param.h>
--- linux-2.6.12.2/fs/binfmt_flat.c	2005-06-22 02:38:33 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/binfmt_flat.c	2005-07-02 22:38:30 +0200
@@ -36,6 +36,7 @@
 #include <linux/personality.h>
 #include <linux/init.h>
 #include <linux/flat.h>
+#include <linux/vs_memory.h>
 
 #include <asm/byteorder.h>
 #include <asm/system.h>
--- linux-2.6.12.2/fs/binfmt_som.c	2005-06-22 02:38:33 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/binfmt_som.c	2005-07-02 22:38:30 +0200
@@ -28,6 +28,7 @@
 #include <linux/shm.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
--- linux-2.6.12.2/fs/exec.c	2005-07-02 21:56:06 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/exec.c	2005-07-02 22:38:30 +0200
@@ -48,6 +48,7 @@
 #include <linux/syscalls.h>
 #include <linux/rmap.h>
 #include <linux/acct.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
--- linux-2.6.12.2/fs/ext2/balloc.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext2/balloc.c	2005-07-02 22:38:30 +0200
@@ -16,6 +16,7 @@
 #include <linux/quotaops.h>
 #include <linux/sched.h>
 #include <linux/buffer_head.h>
+#include <linux/vs_dlimit.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- linux-2.6.12.2/fs/ext2/ialloc.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext2/ialloc.c	2005-07-09 04:09:10 +0200
@@ -18,6 +18,8 @@
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/xid.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- linux-2.6.12.2/fs/ext2/inode.c	2005-06-22 02:38:35 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext2/inode.c	2005-07-02 22:38:30 +0200
@@ -31,6 +31,7 @@
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>
 #include <linux/mpage.h>
+#include <linux/vserver/xid.h>
 #include "ext2.h"
 #include "acl.h"
 
--- linux-2.6.12.2/fs/ext2/namei.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext2/namei.c	2005-07-02 22:38:30 +0200
@@ -31,6 +31,7 @@
  */
 
 #include <linux/pagemap.h>
+#include <linux/vserver/xid.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- linux-2.6.12.2/fs/ext2/xattr.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext2/xattr.c	2005-07-02 22:38:30 +0200
@@ -60,6 +60,7 @@
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
 #include <linux/rwsem.h>
+#include <linux/vs_dlimit.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- linux-2.6.12.2/fs/ext3/balloc.c	2005-06-22 02:38:36 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/balloc.c	2005-07-02 22:38:30 +0200
@@ -19,6 +19,7 @@
 #include <linux/ext3_jbd.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include <linux/vs_dlimit.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- linux-2.6.12.2/fs/ext3/ialloc.c	2005-06-22 02:38:36 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/ialloc.c	2005-07-09 04:09:10 +0200
@@ -23,6 +23,8 @@
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/bitops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/xid.h>
 
 #include <asm/byteorder.h>
 
--- linux-2.6.12.2/fs/ext3/inode.c	2005-06-22 02:38:36 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/inode.c	2005-07-02 22:38:30 +0200
@@ -36,6 +36,7 @@
 #include <linux/writeback.h>
 #include <linux/mpage.h>
 #include <linux/uio.h>
+#include <linux/vserver/xid.h>
 #include "xattr.h"
 #include "acl.h"
 
--- linux-2.6.12.2/fs/ext3/ioctl.c	2005-06-22 02:38:36 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/ioctl.c	2005-07-02 22:38:30 +0200
@@ -12,6 +12,7 @@
 #include <linux/ext3_fs.h>
 #include <linux/ext3_jbd.h>
 #include <linux/time.h>
+#include <linux/vserver/xid.h>
 #include <asm/uaccess.h>
 
 
--- linux-2.6.12.2/fs/ext3/namei.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/namei.c	2005-07-02 22:38:30 +0200
@@ -36,6 +36,7 @@
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
 #include <linux/smp_lock.h>
+#include <linux/vserver/xid.h>
 #include "xattr.h"
 #include "acl.h"
 
--- linux-2.6.12.2/fs/ext3/xattr.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/ext3/xattr.c	2005-07-02 22:38:30 +0200
@@ -58,6 +58,7 @@
 #include <linux/mbcache.h>
 #include <linux/quotaops.h>
 #include <linux/rwsem.h>
+#include <linux/vs_dlimit.h>
 #include "xattr.h"
 #include "acl.h"
 
--- linux-2.6.12.2/fs/fcntl.c	2005-06-22 02:38:36 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/fcntl.c	2005-07-02 22:38:30 +0200
@@ -16,6 +16,7 @@
 #include <linux/security.h>
 #include <linux/ptrace.h>
 #include <linux/signal.h>
+#include <linux/vs_limit.h>
 
 #include <asm/poll.h>
 #include <asm/siginfo.h>
--- linux-2.6.12.2/fs/file_table.c	2005-03-02 12:38:44 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/file_table.c	2005-07-02 22:38:30 +0200
@@ -16,6 +16,8 @@
 #include <linux/eventpoll.h>
 #include <linux/mount.h>
 #include <linux/cdev.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
 
 /* sysctl tunables... */
 struct files_stat_struct files_stat = {
--- linux-2.6.12.2/fs/jfs/jfs_imap.c	2005-06-22 02:38:36 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/jfs/jfs_imap.c	2005-07-02 22:38:30 +0200
@@ -45,6 +45,7 @@
 #include <linux/buffer_head.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/xid.h>
 
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
--- linux-2.6.12.2/fs/jfs/jfs_inode.c	2004-10-23 05:06:16 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/jfs/jfs_inode.c	2005-07-09 04:09:36 +0200
@@ -18,6 +18,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/xid.h>
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
 #include "jfs_imap.h"
--- linux-2.6.12.2/fs/locks.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/locks.c	2005-07-02 22:38:30 +0200
@@ -124,6 +124,7 @@
 #include <linux/smp_lock.h>
 #include <linux/syscalls.h>
 #include <linux/time.h>
+#include <linux/vs_limit.h>
 
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
--- linux-2.6.12.2/fs/namei.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/namei.c	2005-07-09 04:35:26 +0200
@@ -28,6 +28,9 @@
 #include <linux/syscalls.h>
 #include <linux/mount.h>
 #include <linux/audit.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vserver/debug.h>
 #include <asm/namei.h>
 #include <asm/uaccess.h>
 
--- linux-2.6.12.2/fs/namespace.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/namespace.c	2005-07-09 04:35:26 +0200
@@ -22,6 +22,8 @@
 #include <linux/namei.h>
 #include <linux/security.h>
 #include <linux/mount.h>
+#include <linux/vserver/namespace.h>
+#include <linux/vserver/xid.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
--- linux-2.6.12.2/fs/nfs/dir.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfs/dir.c	2005-07-02 22:38:30 +0200
@@ -31,6 +31,7 @@
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
 #include <linux/namei.h>
+#include <linux/vserver/xid.h>
 
 #include "delegation.h"
 
--- linux-2.6.12.2/fs/nfs/inode.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfs/inode.c	2005-07-02 22:38:30 +0200
@@ -35,6 +35,7 @@
 #include <linux/mount.h>
 #include <linux/nfs_idmap.h>
 #include <linux/vfs.h>
+#include <linux/vserver/xid.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- linux-2.6.12.2/fs/nfs/nfs3xdr.c	2004-10-23 05:06:17 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfs/nfs3xdr.c	2005-07-02 22:38:30 +0200
@@ -21,6 +21,7 @@
 #include <linux/nfs.h>
 #include <linux/nfs3.h>
 #include <linux/nfs_fs.h>
+#include <linux/vserver/xid.h>
 
 #define NFSDBG_FACILITY		NFSDBG_XDR
 
--- linux-2.6.12.2/fs/nfs/nfsroot.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfs/nfsroot.c	2005-07-02 22:38:30 +0200
@@ -87,6 +87,7 @@
 #include <linux/root_dev.h>
 #include <net/ipconfig.h>
 #include <linux/parser.h>
+#include <linux/vs_cvirt.h>
 
 /* Define this to allow debugging output */
 #undef NFSROOT_DEBUG
--- linux-2.6.12.2/fs/nfsd/auth.c	2004-08-14 12:56:14 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfsd/auth.c	2005-07-02 22:38:30 +0200
@@ -9,6 +9,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcauth.h>
 #include <linux/nfsd/nfsd.h>
+#include <linux/vserver/xid.h>
 
 #define	CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
 
--- linux-2.6.12.2/fs/nfsd/nfs3xdr.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfsd/nfs3xdr.c	2005-07-02 22:38:30 +0200
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/xdr3.h>
+#include <linux/vserver/xid.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- linux-2.6.12.2/fs/nfsd/nfs4xdr.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfsd/nfs4xdr.c	2005-07-02 22:38:30 +0200
@@ -57,6 +57,7 @@
 #include <linux/nfsd_idmap.h>
 #include <linux/nfs4.h>
 #include <linux/nfs4_acl.h>
+#include <linux/vserver/xid.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- linux-2.6.12.2/fs/nfsd/nfsxdr.c	2004-08-14 12:54:47 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/nfsd/nfsxdr.c	2005-07-02 22:38:30 +0200
@@ -15,6 +15,7 @@
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/xdr.h>
 #include <linux/mm.h>
+#include <linux/vserver/xid.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- linux-2.6.12.2/fs/open.c	2005-03-02 12:38:45 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/open.c	2005-07-02 22:38:30 +0200
@@ -23,6 +23,9 @@
 #include <linux/fs.h>
 #include <linux/pagemap.h>
 #include <linux/syscalls.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vserver/xid.h>
 
 #include <asm/unistd.h>
 
--- linux-2.6.12.2/fs/proc/array.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/proc/array.c	2005-07-02 22:38:30 +0200
@@ -74,6 +74,9 @@
 #include <linux/file.h>
 #include <linux/times.h>
 #include <linux/cpuset.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
--- linux-2.6.12.2/fs/proc/base.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/proc/base.c	2005-07-02 22:38:30 +0200
@@ -35,6 +35,7 @@
 #include <linux/seccomp.h>
 #include <linux/cpuset.h>
 #include <linux/audit.h>
+#include <linux/vs_network.h>
 #include "internal.h"
 
 /*
--- linux-2.6.12.2/fs/proc/generic.c	2005-03-02 12:38:45 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/proc/generic.c	2005-07-02 22:38:30 +0200
@@ -19,6 +19,7 @@
 #include <linux/idr.h>
 #include <linux/namei.h>
 #include <linux/bitops.h>
+#include <linux/vserver/inode.h>
 #include <asm/uaccess.h>
 
 static ssize_t proc_file_read(struct file *file, char __user *buf,
--- linux-2.6.12.2/fs/proc/proc_misc.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/proc/proc_misc.c	2005-07-02 22:38:30 +0200
@@ -51,6 +51,8 @@
 #include <asm/div64.h>
 #include "internal.h"
 
+#include <linux/vs_cvirt.h>
+
 #define LOAD_INT(x) ((x) >> FSHIFT)
 #define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
 /*
--- linux-2.6.12.2/fs/quota.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/quota.c	2005-07-02 22:38:30 +0200
@@ -15,6 +15,8 @@
 #include <linux/security.h>
 #include <linux/syscalls.h>
 #include <linux/buffer_head.h>
+#include <linux/major.h>
+#include <linux/blkdev.h>
 
 /* Check validity of generic quotactl commands */
 static int generic_quotactl_valid(struct super_block *sb, int type, int cmd, qid_t id)
--- linux-2.6.12.2/fs/reiserfs/inode.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/reiserfs/inode.c	2005-07-09 04:09:27 +0200
@@ -17,6 +17,7 @@
 #include <linux/mpage.h>
 #include <linux/writeback.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/xid.h>
 
 extern int reiserfs_default_io_size; /* default io size devuned in super.c */
 
--- linux-2.6.12.2/fs/reiserfs/namei.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/reiserfs/namei.c	2005-07-09 04:09:27 +0200
@@ -19,6 +19,7 @@
 #include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 #include <linux/quotaops.h>
+#include <linux/vserver/xid.h>
 
 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { i->i_nlink++; if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) i->i_nlink--;
--- linux-2.6.12.2/fs/super.c	2005-06-22 02:38:37 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/super.c	2005-07-02 22:38:30 +0200
@@ -37,6 +37,8 @@
 #include <linux/writeback.h>		/* for the emergency remount stuff */
 #include <linux/idr.h>
 #include <linux/kobject.h>
+#include <linux/devpts_fs.h>
+#include <linux/proc_fs.h>
 #include <asm/uaccess.h>
 
 
--- linux-2.6.12.2/include/asm-arm/tlb.h	2005-06-22 02:38:42 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-arm/tlb.h	2005-07-02 22:38:30 +0200
@@ -20,6 +20,7 @@
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
 #include <asm/pgalloc.h>
+#include <linux/vs_memory.h>
 
 /*
  * TLB handling.  This allows us to remove pages from the page
--- linux-2.6.12.2/include/asm-arm26/tlb.h	2005-06-22 02:38:42 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-arm26/tlb.h	2005-07-02 22:38:30 +0200
@@ -3,6 +3,7 @@
 
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
+#include <linux/vs_memory.h>
 
 /*
  * TLB handling.  This allows us to remove pages from the page
--- linux-2.6.12.2/include/asm-generic/tlb.h	2005-06-22 02:38:43 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-generic/tlb.h	2005-07-02 22:38:30 +0200
@@ -15,6 +15,7 @@
 
 #include <linux/config.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
--- linux-2.6.12.2/include/asm-ia64/tlb.h	2005-06-22 02:38:43 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-ia64/tlb.h	2005-07-02 22:38:30 +0200
@@ -41,6 +41,7 @@
 #include <linux/mm.h>
 #include <linux/pagemap.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgalloc.h>
 #include <asm/processor.h>
--- linux-2.6.12.2/include/asm-sparc64/tlb.h	2005-06-22 02:38:47 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/asm-sparc64/tlb.h	2005-07-02 22:38:30 +0200
@@ -3,6 +3,7 @@
 
 #include <linux/config.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
--- linux-2.6.12.2/include/linux/ptrace.h	2005-03-02 12:38:53 +0100
+++ linux-2.6.12.2-vs2.0-rc6.1/include/linux/ptrace.h	2005-07-02 22:38:30 +0200
@@ -75,6 +75,8 @@
 
 #include <linux/compiler.h>		/* For unlikely.  */
 #include <linux/sched.h>		/* For struct task_struct.  */
+#include <linux/vs_cvirt.h>
+#include <linux/vs_context.h>
 
 extern int ptrace_readdata(struct task_struct *tsk, unsigned long src, char __user *dst, int len);
 extern int ptrace_writedata(struct task_struct *tsk, char __user *src, unsigned long dst, int len);
--- linux-2.6.12.2/include/linux/sched.h	2005-06-22 02:38:49 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/linux/sched.h	2005-07-02 22:38:30 +0200
@@ -34,6 +34,7 @@
 #include <linux/percpu.h>
 #include <linux/topology.h>
 #include <linux/seccomp.h>
+#include <linux/vs_base.h>
 
 struct exec_domain;
 
--- linux-2.6.12.2/include/net/route.h	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/include/net/route.h	2005-07-02 22:38:30 +0200
@@ -33,6 +33,7 @@
 #include <linux/route.h>
 #include <linux/ip.h>
 #include <linux/cache.h>
+#include <linux/vs_network.h>
 
 #ifndef __KERNEL__
 #warning This file is not supposed to be used outside of kernel.
--- linux-2.6.12.2/ipc/mqueue.c	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/ipc/mqueue.c	2005-07-02 22:38:30 +0200
@@ -24,6 +24,8 @@
 #include <linux/netlink.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 #include <net/sock.h>
 #include "util.h"
 
--- linux-2.6.12.2/ipc/shm.c	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/ipc/shm.c	2005-07-02 22:38:30 +0200
@@ -29,6 +29,7 @@
 #include <linux/syscalls.h>
 #include <linux/audit.h>
 #include <linux/ptrace.h>
+#include <linux/vs_limit.h>
 
 #include <asm/uaccess.h>
 
--- linux-2.6.12.2/kernel/capability.c	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/capability.c	2005-07-02 22:38:30 +0200
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_cvirt.h>
 #include <asm/uaccess.h>
 
 unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
--- linux-2.6.12.2/kernel/cpuset.c	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/cpuset.c	2005-07-02 22:38:30 +0200
@@ -48,6 +48,7 @@
 #include <linux/time.h>
 #include <linux/backing-dev.h>
 #include <linux/sort.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/atomic.h>
--- linux-2.6.12.2/kernel/exit.c	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/exit.c	2005-07-02 22:38:30 +0200
@@ -28,6 +28,8 @@
 #include <linux/cpuset.h>
 #include <linux/syscalls.h>
 #include <linux/signal.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_network.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- linux-2.6.12.2/kernel/fork.c	2005-06-22 02:38:52 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/fork.c	2005-07-02 22:38:30 +0200
@@ -41,6 +41,9 @@
 #include <linux/profile.h>
 #include <linux/rmap.h>
 #include <linux/acct.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
--- linux-2.6.12.2/kernel/posix-cpu-timers.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/posix-cpu-timers.c	2005-07-02 22:38:30 +0200
@@ -6,6 +6,7 @@
 #include <linux/posix-timers.h>
 #include <asm/uaccess.h>
 #include <linux/errno.h>
+#include <linux/vs_cvirt.h>
 
 static int check_clock(clockid_t which_clock)
 {
--- linux-2.6.12.2/kernel/posix-timers.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/posix-timers.c	2005-07-02 22:38:30 +0200
@@ -47,6 +47,7 @@
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 #include <linux/module.h>
+#include <linux/vs_cvirt.h>
 
 #ifndef div_long_long_rem
 #include <asm/div64.h>
--- linux-2.6.12.2/kernel/sched.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/sched.c	2005-07-02 22:38:30 +0200
@@ -50,6 +50,9 @@
 #include <asm/tlb.h>
 
 #include <asm/unistd.h>
+#include <linux/vs_context.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_sched.h>
 
 /*
  * Convert user-nice values [ -20 ... 0 ... 19 ]
--- linux-2.6.12.2/kernel/sys.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/sys.c	2005-07-02 22:38:30 +0200
@@ -11,6 +11,7 @@
 #include <linux/mman.h>
 #include <linux/smp_lock.h>
 #include <linux/notifier.h>
+#include <linux/kmod.h>
 #include <linux/reboot.h>
 #include <linux/prctl.h>
 #include <linux/init.h>
--- linux-2.6.12.2/kernel/sys.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/sys.c	2005-07-02 22:38:30 +0200
@@ -29,6 +30,7 @@
 
 #include <linux/compat.h>
 #include <linux/syscalls.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
--- linux-2.6.12.2/kernel/sysctl.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/sysctl.c	2005-07-02 22:38:30 +0200
@@ -41,6 +41,7 @@
 #include <linux/limits.h>
 #include <linux/dcache.h>
 #include <linux/syscalls.h>
+#include <linux/vserver/cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/processor.h>
--- linux-2.6.12.2/kernel/timer.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/timer.c	2005-07-09 03:54:37 +0200
@@ -33,6 +33,8 @@
 #include <linux/posix-timers.h>
 #include <linux/cpu.h>
 #include <linux/syscalls.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vserver/sched.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- linux-2.6.12.2/mm/fremap.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/mm/fremap.c	2005-07-02 22:38:30 +0200
@@ -15,6 +15,7 @@
 #include <linux/rmap.h>
 #include <linux/module.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 #include <asm/mmu_context.h>
 #include <asm/cacheflush.h>
--- linux-2.6.12.2/mm/mlock.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/mm/mlock.c	2005-07-02 22:38:30 +0200
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/mempolicy.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 
 static int mlock_fixup(struct vm_area_struct *vma, struct vm_area_struct **prev,
--- linux-2.6.12.2/mm/mremap.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/mm/mremap.c	2005-07-09 04:09:51 +0200
@@ -17,6 +17,7 @@
 #include <linux/highmem.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/cacheflush.h>
--- linux-2.6.12.2/mm/page_alloc.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/mm/page_alloc.c	2005-07-02 22:38:30 +0200
@@ -34,6 +34,7 @@
 #include <linux/cpuset.h>
 #include <linux/nodemask.h>
 #include <linux/vmalloc.h>
+#include <linux/vs_limit.h>
 
 #include <asm/tlbflush.h>
 #include "internal.h"
--- linux-2.6.12.2/mm/rmap.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/mm/rmap.c	2005-07-02 22:38:30 +0200
@@ -53,6 +53,7 @@
 #include <linux/init.h>
 #include <linux/rmap.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_memory.h>
 
 #include <asm/tlbflush.h>
 
--- linux-2.6.12.2/mm/swapfile.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/mm/swapfile.c	2005-07-02 22:38:30 +0200
@@ -30,6 +30,7 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <linux/swapops.h>
+#include <linux/vs_memory.h>
 
 DEFINE_SPINLOCK(swaplock);
 unsigned int nr_swapfiles;
--- linux-2.6.12.2/net/core/dev.c	2005-06-22 02:38:56 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/core/dev.c	2005-07-02 22:38:30 +0200
@@ -113,6 +113,7 @@
 #include <linux/wireless.h>		/* Note : will define WIRELESS_EXT */
 #include <net/iw_handler.h>
 #endif	/* CONFIG_NET_RADIO */
+#include <linux/vs_network.h>
 #include <asm/current.h>
 
 /* This define, if set, will randomly drop a packet when congestion
--- linux-2.6.12.2/net/core/sock.c	2005-06-22 02:38:56 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/core/sock.c	2005-07-02 22:38:30 +0200
@@ -123,6 +123,9 @@
 #include <linux/ipsec.h>
 
 #include <linux/filter.h>
+#include <linux/vs_socket.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
 
 #ifdef CONFIG_INET
 #include <net/tcp.h>
--- linux-2.6.12.2/net/ipv4/af_inet.c	2005-06-22 02:38:56 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/ipv4/af_inet.c	2005-07-02 22:38:30 +0200
@@ -111,6 +111,7 @@
 #ifdef CONFIG_IP_MROUTE
 #include <linux/mroute.h>
 #endif
+#include <linux/vs_limit.h>
 
 DEFINE_SNMP_STAT(struct linux_mib, net_statistics);
 
--- linux-2.6.12.2/net/ipv4/tcp_ipv4.c	2005-06-22 02:38:57 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/ipv4/tcp_ipv4.c	2005-07-02 22:38:30 +0200
@@ -74,6 +74,7 @@
 #include <linux/stddef.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/vserver/debug.h>
 
 extern int sysctl_ip_dynaddr;
 int sysctl_tcp_tw_reuse;
--- linux-2.6.12.2/net/ipv4/tcp_minisocks.c	2005-06-22 02:38:57 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/ipv4/tcp_minisocks.c	2005-07-02 22:38:30 +0200
@@ -29,6 +29,10 @@
 #include <net/inet_common.h>
 #include <net/xfrm.h>
 
+#include <linux/vs_limit.h>
+#include <linux/vs_socket.h>
+#include <linux/vs_context.h>
+
 #ifdef CONFIG_SYSCTL
 #define SYNC_INIT 0 /* let the user enable it */
 #else
--- linux-2.6.12.2/net/netlink/af_netlink.c	2005-07-02 21:56:06 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/netlink/af_netlink.c	2005-07-02 22:38:30 +0200
@@ -50,6 +50,9 @@
 #include <linux/mm.h>
 #include <linux/types.h>
 #include <linux/audit.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
 
 #include <net/sock.h>
 #include <net/scm.h>
--- linux-2.6.12.2/net/socket.c	2005-06-22 02:39:00 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/socket.c	2005-07-02 22:38:30 +0200
@@ -93,6 +93,7 @@
 
 #include <net/sock.h>
 #include <linux/netfilter.h>
+#include <linux/vs_socket.h>
 
 static int sock_no_open(struct inode *irrelevant, struct file *dontcare);
 static ssize_t sock_aio_read(struct kiocb *iocb, char __user *buf,
--- linux-2.6.12.2/net/sunrpc/auth.c	2005-06-22 02:39:00 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/sunrpc/auth.c	2005-07-02 22:38:30 +0200
@@ -14,6 +14,7 @@
 #include <linux/socket.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/spinlock.h>
+#include <linux/vserver/xid.h>
 
 #ifdef RPC_DEBUG
 # define RPCDBG_FACILITY	RPCDBG_AUTH
--- linux-2.6.12.2/net/unix/af_unix.c	2005-06-22 02:39:00 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/net/unix/af_unix.c	2005-07-02 22:38:30 +0200
@@ -117,6 +117,9 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
 
 int sysctl_unix_max_dgram_qlen = 10;
 
--- linux-2.6.12.2/kernel/printk.c	2005-06-22 02:38:53 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/kernel/printk.c	2005-07-02 22:38:30 +0200
@@ -31,6 +31,7 @@
 #include <linux/security.h>
 #include <linux/bootmem.h>
 #include <linux/syscalls.h>
+#include <linux/vserver/cvirt.h>
 
 #include <asm/uaccess.h>
 
--- linux-2.6.12.2/fs/xfs/xfs_inode.c	2005-06-22 02:38:40 +0200
+++ linux-2.6.12.2-vs2.0-rc6.1/fs/xfs/xfs_inode.c	2005-07-09 04:09:10 +0200
@@ -67,6 +67,7 @@
 #include "xfs_mac.h"
 #include "xfs_acl.h"
 
+#include <linux/vserver/xid.h>
 
 kmem_zone_t *xfs_ifork_zone;
 kmem_zone_t *xfs_inode_zone;