--- olpc-2.6-master.00/arch/i386/kernel/sysenter.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/i386/kernel/sysenter.c	2007-03-01 11:52:20.000000000 -0500
@@ -17,6 +17,7 @@
 #include <linux/elf.h>
 #include <linux/mm.h>
 #include <linux/module.h>
+#include <linux/vs_memory.h>
 
 #include <asm/cpufeature.h>
 #include <asm/msr.h>
--- olpc-2.6-master.00/arch/i386/kernel/traps.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/i386/kernel/traps.c	2007-03-01 11:52:20.000000000 -0500
@@ -56,6 +56,8 @@
 #include <asm/stacktrace.h>
 
 #include <linux/module.h>
+#include <linux/vs_context.h>
+#include <linux/vserver/history.h>
 
 #include "mach_traps.h"
 
--- olpc-2.6-master.00/arch/ia64/kernel/perfmon.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/ia64/kernel/perfmon.c	2007-03-01 11:52:20.000000000 -0500
@@ -41,6 +41,7 @@
 #include <linux/capability.h>
 #include <linux/rcupdate.h>
 #include <linux/completion.h>
+#include <linux/vs_memory.h>
 
 #include <asm/errno.h>
 #include <asm/intrinsics.h>
--- olpc-2.6-master.00/arch/ia64/mm/fault.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/ia64/mm/fault.c	2007-03-01 11:52:20.000000000 -0500
@@ -10,6 +10,7 @@
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
 #include <linux/kprobes.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
--- olpc-2.6-master.00/arch/powerpc/kernel/irq.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/powerpc/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -53,6 +53,7 @@
 #include <linux/mutex.h>
 #include <linux/bootmem.h>
 #include <linux/pci.h>
+#include <linux/vs_context.h>
 
 #include <asm/uaccess.h>
 #include <asm/system.h>
--- olpc-2.6-master.00/arch/powerpc/kernel/vdso.c	2007-02-28 20:05:25.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/powerpc/kernel/vdso.c	2007-03-01 11:52:20.000000000 -0500
@@ -22,6 +22,7 @@
 #include <linux/elf.h>
 #include <linux/security.h>
 #include <linux/bootmem.h>
+#include <linux/vs_memory.h>
 
 #include <asm/pgtable.h>
 #include <asm/system.h>
--- olpc-2.6-master.00/arch/sh/kernel/irq.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/sh/kernel/irq.c	2007-03-01 11:52:20.000000000 -0500
@@ -13,6 +13,7 @@
 #include <linux/seq_file.h>
 #include <linux/io.h>
 #include <linux/irq.h>
+#include <linux/vs_context.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 #include <asm/thread_info.h>
--- olpc-2.6-master.00/arch/sh/kernel/vsyscall/vsyscall.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/sh/kernel/vsyscall/vsyscall.c	2007-03-01 11:52:20.000000000 -0500
@@ -17,6 +17,7 @@
 #include <linux/gfp.h>
 #include <linux/module.h>
 #include <linux/elf.h>
+#include <linux/vs_memory.h>
 
 /*
  * Should the kernel map a VDSO page into processes and pass its
--- olpc-2.6-master.00/arch/sparc64/kernel/binfmt_aout32.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/sparc64/kernel/binfmt_aout32.c	2007-03-01 11:52:20.000000000 -0500
@@ -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>
--- olpc-2.6-master.00/arch/x86_64/ia32/ia32_aout.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/x86_64/ia32/ia32_aout.c	2007-03-01 11:52:20.000000000 -0500
@@ -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>
--- olpc-2.6-master.00/arch/x86_64/ia32/syscall32.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/arch/x86_64/ia32/syscall32.c	2007-03-01 11:52:20.000000000 -0500
@@ -10,6 +10,7 @@
 #include <linux/init.h>
 #include <linux/stringify.h>
 #include <linux/security.h>
+#include <linux/vs_memory.h>
 #include <asm/proto.h>
 #include <asm/tlbflush.h>
 #include <asm/ia32_unistd.h>
--- olpc-2.6-master.00/drivers/block/loop.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/drivers/block/loop.c	2007-03-01 11:52:20.000000000 -0500
@@ -74,6 +74,7 @@
 #include <linux/highmem.h>
 #include <linux/gfp.h>
 #include <linux/kthread.h>
+#include <linux/vs_context.h>
 
 #include <asm/uaccess.h>
 
--- olpc-2.6-master.00/drivers/char/sysrq.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/drivers/char/sysrq.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,7 @@
 #include <linux/kexec.h>
 #include <linux/irq.h>
 #include <linux/hrtimer.h>
+#include <linux/vserver/debug.h>
 
 #include <asm/ptrace.h>
 #include <asm/irq_regs.h>
--- olpc-2.6-master.00/drivers/char/tty_io.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/drivers/char/tty_io.c	2007-03-01 11:52:20.000000000 -0500
@@ -103,6 +103,7 @@
 #include <linux/selection.h>
 
 #include <linux/kmod.h>
+#include <linux/vs_pid.h>
 
 #undef TTY_DEBUG_HANGUP
 
--- olpc-2.6-master.00/drivers/infiniband/core/uverbs_mem.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/drivers/infiniband/core/uverbs_mem.c	2007-03-01 11:52:20.000000000 -0500
@@ -36,6 +36,7 @@
 
 #include <linux/mm.h>
 #include <linux/dma-mapping.h>
+#include <linux/vs_memory.h>
 
 #include "uverbs.h"
 
--- olpc-2.6-master.00/drivers/infiniband/hw/ipath/ipath_user_pages.c	2007-02-28 20:05:26.000000000 -0500
+++ olpc-2.6-master-vs22x.02/drivers/infiniband/hw/ipath/ipath_user_pages.c	2007-03-01 11:52:20.000000000 -0500
@@ -33,6 +33,7 @@
 
 #include <linux/mm.h>
 #include <linux/device.h>
+#include <linux/vs_memory.h>
 
 #include "ipath_kernel.h"
 
--- olpc-2.6-master.00/fs/attr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/attr.c	2007-03-01 11:52:20.000000000 -0500
@@ -15,6 +15,9 @@
 #include <linux/fcntl.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
+#include <linux/proc_fs.h>
+#include <linux/devpts_fs.h>
+#include <linux/vs_base.h>
 
 /* Taken over from the old code... */
 
--- olpc-2.6-master.00/fs/binfmt_aout.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/binfmt_aout.c	2007-03-01 11:52:20.000000000 -0500
@@ -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>
--- olpc-2.6-master.00/fs/binfmt_elf.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/binfmt_elf.c	2007-03-01 11:52:20.000000000 -0500
@@ -39,6 +39,7 @@
 #include <linux/syscalls.h>
 #include <linux/random.h>
 #include <linux/elf.h>
+#include <linux/vs_memory.h>
 #include <asm/uaccess.h>
 #include <asm/param.h>
 #include <asm/page.h>
--- olpc-2.6-master.00/fs/binfmt_flat.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/binfmt_flat.c	2007-03-01 11:52:20.000000000 -0500
@@ -36,6 +36,7 @@
 #include <linux/init.h>
 #include <linux/flat.h>
 #include <linux/syscalls.h>
+#include <linux/vs_memory.h>
 
 #include <asm/byteorder.h>
 #include <asm/system.h>
--- olpc-2.6-master.00/fs/binfmt_som.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/binfmt_som.c	2007-03-01 11:52:20.000000000 -0500
@@ -28,6 +28,7 @@
 #include <linux/shm.h>
 #include <linux/personality.h>
 #include <linux/init.h>
+#include <linux/vs_memory.h>
 
 #include <asm/a.out.h>
 #include <asm/uaccess.h>
--- olpc-2.6-master.00/fs/dcache.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/dcache.c	2007-03-01 11:52:20.000000000 -0500
@@ -32,6 +32,7 @@
 #include <linux/seqlock.h>
 #include <linux/swap.h>
 #include <linux/bootmem.h>
+#include <linux/vs_limit.h>
 #include "internal.h"
 
 
--- olpc-2.6-master.00/fs/exec.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/exec.c	2007-03-01 11:52:20.000000000 -0500
@@ -50,6 +50,7 @@
 #include <linux/tsacct_kern.h>
 #include <linux/cn_proc.h>
 #include <linux/audit.h>
+#include <linux/vs_memory.h>
 
 #include <asm/uaccess.h>
 #include <asm/mmu_context.h>
--- olpc-2.6-master.00/fs/ext2/balloc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext2/balloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -16,6 +16,8 @@
 #include <linux/sched.h>
 #include <linux/buffer_head.h>
 #include <linux/capability.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- olpc-2.6-master.00/fs/ext2/ialloc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext2/ialloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -17,6 +17,8 @@
 #include <linux/backing-dev.h>
 #include <linux/buffer_head.h>
 #include <linux/random.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- olpc-2.6-master.00/fs/ext2/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext2/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -31,6 +31,7 @@
 #include <linux/writeback.h>
 #include <linux/buffer_head.h>
 #include <linux/mpage.h>
+#include <linux/vs_tag.h>
 #include "ext2.h"
 #include "acl.h"
 #include "xip.h"
--- olpc-2.6-master.00/fs/ext2/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext2/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -31,6 +31,7 @@
  */
 
 #include <linux/pagemap.h>
+#include <linux/vs_tag.h>
 #include "ext2.h"
 #include "xattr.h"
 #include "acl.h"
--- olpc-2.6-master.00/fs/ext2/xattr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext2/xattr.c	2007-03-01 11:52:20.000000000 -0500
@@ -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"
--- olpc-2.6-master.00/fs/ext3/balloc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/balloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -19,6 +19,8 @@
 #include <linux/ext3_jbd.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- olpc-2.6-master.00/fs/ext3/ialloc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/ialloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -23,6 +23,8 @@
 #include <linux/buffer_head.h>
 #include <linux/random.h>
 #include <linux/bitops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 #include <asm/byteorder.h>
 
--- olpc-2.6-master.00/fs/ext3/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,7 @@
 #include <linux/mpage.h>
 #include <linux/uio.h>
 #include <linux/bio.h>
+#include <linux/vs_tag.h>
 #include "xattr.h"
 #include "acl.h"
 
--- olpc-2.6-master.00/fs/ext3/ioctl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/ioctl.c	2007-03-01 17:09:59.000000000 -0500
@@ -15,6 +16,7 @@
 #include <linux/time.h>
 #include <linux/compat.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_tag.h>
 #include <asm/uaccess.h>
 
 int ext3_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
--- olpc-2.6-master.00/fs/ext3/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,7 @@
 #include <linux/buffer_head.h>
 #include <linux/bio.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_tag.h>
 
 #include "namei.h"
 #include "xattr.h"
--- olpc-2.6-master.00/fs/ext3/xattr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext3/xattr.c	2007-03-01 11:52:20.000000000 -0500
@@ -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"
 
--- olpc-2.6-master.00/fs/ext4/balloc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/balloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -19,6 +19,8 @@
 #include <linux/ext4_jbd2.h>
 #include <linux/quotaops.h>
 #include <linux/buffer_head.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 /*
  * balloc.c contains the blocks allocation and deallocation routines
--- olpc-2.6-master.00/fs/ext4/ialloc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/ialloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -24,6 +24,8 @@
 #include <linux/random.h>
 #include <linux/bitops.h>
 #include <linux/blkdev.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 #include <asm/byteorder.h>
 
 #include "xattr.h"
--- olpc-2.6-master.00/fs/ext4/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,7 @@
 #include <linux/mpage.h>
 #include <linux/uio.h>
 #include <linux/bio.h>
+#include <linux/vs_tag.h>
 #include "xattr.h"
 #include "acl.h"
 
--- olpc-2.6-master.00/fs/ext4/ioctl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/ioctl.c	2007-03-01 17:09:59.000000000 -0500
@@ -15,6 +16,7 @@
 #include <linux/time.h>
 #include <linux/compat.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_tag.h>
 #include <asm/uaccess.h>
 
 int ext4_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
--- olpc-2.6-master.00/fs/ext4/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,7 @@
 #include <linux/buffer_head.h>
 #include <linux/bio.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_tag.h>
 
 #include "namei.h"
 #include "xattr.h"
--- olpc-2.6-master.00/fs/ext4/xattr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ext4/xattr.c	2007-03-01 11:52:20.000000000 -0500
@@ -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"
 
--- olpc-2.6-master.00/fs/fcntl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/fcntl.c	2007-03-01 11:52:20.000000000 -0500
@@ -18,6 +18,7 @@
 #include <linux/ptrace.h>
 #include <linux/signal.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_limit.h>
 
 #include <asm/poll.h>
 #include <asm/siginfo.h>
--- olpc-2.6-master.00/fs/file_table.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/file_table.c	2007-03-01 11:52:20.000000000 -0500
@@ -21,6 +21,8 @@
 #include <linux/fsnotify.h>
 #include <linux/sysctl.h>
 #include <linux/percpu_counter.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
 
 #include <asm/atomic.h>
 
--- olpc-2.6-master.00/fs/ioctl.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ioctl.c	2007-03-01 17:09:59.000000000 -0500
@@ -12,6 +12,9 @@
 #include <linux/fs.h>
 #include <linux/security.h>
 #include <linux/module.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vs_tag.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctls.h>
--- olpc-2.6-master.00/fs/jfs/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -22,6 +22,7 @@
 #include <linux/buffer_head.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_filsys.h"
--- olpc-2.6-master.00/fs/jfs/jfs_dtree.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/jfs_dtree.c	2007-03-01 11:52:20.000000000 -0500
@@ -102,6 +102,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_filsys.h"
--- olpc-2.6-master.00/fs/jfs/jfs_extent.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/jfs_extent.c	2007-03-01 11:52:20.000000000 -0500
@@ -18,6 +18,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_superblock.h"
--- olpc-2.6-master.00/fs/jfs/jfs_imap.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/jfs_imap.c	2007-03-01 11:52:20.000000000 -0500
@@ -45,6 +45,7 @@
 #include <linux/buffer_head.h>
 #include <linux/pagemap.h>
 #include <linux/quotaops.h>
+#include <linux/vs_tag.h>
 
 #include "jfs_incore.h"
 #include "jfs_inode.h"
--- olpc-2.6-master.00/fs/jfs/jfs_inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/jfs_inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -18,6 +18,8 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 #include "jfs_incore.h"
 #include "jfs_inode.h"
 #include "jfs_filsys.h"
--- olpc-2.6-master.00/fs/jfs/jfs_xtree.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/jfs_xtree.c	2007-03-01 11:52:20.000000000 -0500
@@ -21,6 +21,7 @@
 
 #include <linux/fs.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_filsys.h"
 #include "jfs_metapage.h"
--- olpc-2.6-master.00/fs/jfs/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -20,6 +20,7 @@
 #include <linux/fs.h>
 #include <linux/ctype.h>
 #include <linux/quotaops.h>
+#include <linux/vs_tag.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_inode.h"
--- olpc-2.6-master.00/fs/jfs/xattr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/jfs/xattr.c	2007-03-01 11:52:20.000000000 -0500
@@ -23,6 +23,7 @@
 #include <linux/posix_acl_xattr.h>
 #include <linux/quotaops.h>
 #include <linux/security.h>
+#include <linux/vs_dlimit.h>
 #include "jfs_incore.h"
 #include "jfs_superblock.h"
 #include "jfs_dmap.h"
--- olpc-2.6-master.00/fs/locks.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/locks.c	2007-03-01 12:01:25.000000000 -0500
@@ -125,6 +125,8 @@
 #include <linux/syscalls.h>
 #include <linux/time.h>
 #include <linux/rcupdate.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
 
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
--- olpc-2.6-master.00/fs/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -32,6 +32,11 @@
 #include <linux/file.h>
 #include <linux/fcntl.h>
 #include <linux/namei.h>
+#include <linux/proc_fs.h>
+#include <linux/vserver/inode.h>
+#include <linux/vs_base.h>
+#include <linux/vs_tag.h>
+#include <linux/vs_cowbl.h>
 #include <asm/namei.h>
 #include <asm/uaccess.h>
 
--- olpc-2.6-master.00/fs/namespace.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/namespace.c	2007-03-01 11:52:20.000000000 -0500
@@ -25,6 +25,11 @@
 #include <linux/security.h>
 #include <linux/mount.h>
 #include <linux/ramfs.h>
+#include <linux/vs_base.h>
+#include <linux/vs_context.h>
+#include <linux/vs_tag.h>
+#include <linux/vserver/space.h>
+#include <linux/vserver/global.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 #include "pnode.h"
--- olpc-2.6-master.00/fs/nfs/dir.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfs/dir.c	2007-03-01 11:52:20.000000000 -0500
@@ -33,6 +33,7 @@
 #include <linux/pagevec.h>
 #include <linux/namei.h>
 #include <linux/mount.h>
+#include <linux/vs_tag.h>
 
 #include "nfs4_fs.h"
 #include "delegation.h"
--- olpc-2.6-master.00/fs/nfs/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfs/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,7 @@
 #include <linux/vfs.h>
 #include <linux/inet.h>
 #include <linux/nfs_xdr.h>
+#include <linux/vs_tag.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- olpc-2.6-master.00/fs/nfs/nfs3xdr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfs/nfs3xdr.c	2007-03-01 11:52:20.000000000 -0500
@@ -22,6 +22,7 @@
 #include <linux/nfs3.h>
 #include <linux/nfs_fs.h>
 #include <linux/nfsacl.h>
+#include <linux/vs_tag.h>
 #include "internal.h"
 
 #define NFSDBG_FACILITY		NFSDBG_XDR
--- olpc-2.6-master.00/fs/nfs/super.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfs/super.c	2007-03-01 11:52:20.000000000 -0500
@@ -45,6 +45,7 @@
 #include <linux/inet.h>
 #include <linux/nfs_xdr.h>
 #include <linux/magic.h>
+#include <linux/vs_tag.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
--- olpc-2.6-master.00/fs/nfsd/auth.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfsd/auth.c	2007-03-01 11:52:20.000000000 -0500
@@ -9,6 +9,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/sunrpc/svcauth.h>
 #include <linux/nfsd/nfsd.h>
+#include <linux/vs_tag.h>
 
 #define	CAP_NFSD_MASK (CAP_FS_MASK|CAP_TO_MASK(CAP_SYS_RESOURCE))
 
--- olpc-2.6-master.00/fs/nfsd/nfs3xdr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfsd/nfs3xdr.c	2007-03-01 11:52:20.000000000 -0500
@@ -21,6 +21,7 @@
 #include <linux/sunrpc/svc.h>
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/xdr3.h>
+#include <linux/vs_tag.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- olpc-2.6-master.00/fs/nfsd/nfs4xdr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfsd/nfs4xdr.c	2007-03-01 11:52:20.000000000 -0500
@@ -57,6 +57,7 @@
 #include <linux/nfsd_idmap.h>
 #include <linux/nfs4.h>
 #include <linux/nfs4_acl.h>
+#include <linux/vs_tag.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- olpc-2.6-master.00/fs/nfsd/nfsxdr.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/nfsd/nfsxdr.c	2007-03-01 11:52:20.000000000 -0500
@@ -15,6 +15,7 @@
 #include <linux/nfsd/nfsd.h>
 #include <linux/nfsd/xdr.h>
 #include <linux/mm.h>
+#include <linux/vs_tag.h>
 
 #define NFSDDBG_FACILITY		NFSDDBG_XDR
 
--- olpc-2.6-master.00/fs/ocfs2/dlm/dlmfs.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ocfs2/dlm/dlmfs.c	2007-03-01 11:52:20.000000000 -0500
@@ -44,6 +44,7 @@
 #include <linux/string.h>
 #include <linux/smp_lock.h>
 #include <linux/backing-dev.h>
+#include <linux/vs_tag.h>
 
 #include <asm/uaccess.h>
 
--- olpc-2.6-master.00/fs/ocfs2/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ocfs2/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -29,6 +29,7 @@
 #include <linux/highmem.h>
 #include <linux/pagemap.h>
 #include <linux/smp_lock.h>
+#include <linux/vs_tag.h>
 
 #include <asm/byteorder.h>
 
--- olpc-2.6-master.00/fs/ocfs2/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ocfs2/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -40,6 +40,7 @@
 #include <linux/types.h>
 #include <linux/slab.h>
 #include <linux/highmem.h>
+#include <linux/vs_tag.h>
 
 #define MLOG_MASK_PREFIX ML_NAMEI
 #include <cluster/masklog.h>
--- olpc-2.6-master.00/fs/open.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/open.c	2007-03-01 11:52:20.000000000 -0500
@@ -27,6 +27,11 @@
 #include <linux/syscalls.h>
 #include <linux/rcupdate.h>
 #include <linux/audit.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
+#include <linux/vs_cowbl.h>
 
 int vfs_statfs(struct dentry *dentry, struct kstatfs *buf)
 {
--- olpc-2.6-master.00/fs/proc/array.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/proc/array.c	2007-03-01 17:09:59.000000000 -0500
@@ -75,6 +75,8 @@
 #include <linux/cpuset.h>
 #include <linux/rcupdate.h>
 #include <linux/delayacct.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
 
 #include <asm/uaccess.h>
 #include <asm/pgtable.h>
--- olpc-2.6-master.00/fs/proc/base.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/proc/base.c	2007-03-01 17:09:59.000000000 -0500
@@ -73,6 +73,9 @@
 #include <linux/poll.h>
 #include <linux/nsproxy.h>
 #include <linux/oom.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+
 #include "internal.h"
 
 /* NOTE:
--- olpc-2.6-master.00/fs/proc/internal.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/proc/internal.h	2007-03-01 11:52:20.000000000 -0500
@@ -10,6 +10,7 @@
  */
 
 #include <linux/proc_fs.h>
+#include <linux/vs_pid.h>
 
 extern int proc_sys_init(void);
 
--- olpc-2.6-master.00/fs/proc/proc_misc.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/proc/proc_misc.c	2007-03-01 11:52:20.000000000 -0500
@@ -54,6 +54,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)
 /*
--- olpc-2.6-master.00/fs/reiserfs/bitmap.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/reiserfs/bitmap.c	2007-03-01 11:52:20.000000000 -0500
@@ -13,6 +13,7 @@
 #include <linux/reiserfs_fs_sb.h>
 #include <linux/reiserfs_fs_i.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 
 #define PREALLOCATION_SIZE 9
 
--- olpc-2.6-master.00/fs/reiserfs/inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/reiserfs/inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -16,6 +16,8 @@
 #include <linux/mpage.h>
 #include <linux/writeback.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
+#include <linux/vs_tag.h>
 
 static int reiserfs_commit_write(struct file *f, struct page *page,
 				 unsigned from, unsigned to);
--- olpc-2.6-master.00/fs/reiserfs/namei.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/reiserfs/namei.c	2007-03-01 11:52:20.000000000 -0500
@@ -18,6 +18,7 @@
 #include <linux/reiserfs_xattr.h>
 #include <linux/smp_lock.h>
 #include <linux/quotaops.h>
+#include <linux/vs_tag.h>
 
 #define INC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) { inc_nlink(i); if (i->i_nlink >= REISERFS_LINK_MAX) i->i_nlink=1; }
 #define DEC_DIR_INODE_NLINK(i) if (i->i_nlink != 1) drop_nlink(i);
--- olpc-2.6-master.00/fs/reiserfs/stree.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/reiserfs/stree.c	2007-03-01 11:52:20.000000000 -0500
@@ -56,6 +56,7 @@
 #include <linux/smp_lock.h>
 #include <linux/buffer_head.h>
 #include <linux/quotaops.h>
+#include <linux/vs_dlimit.h>
 
 /* Does the buffer contain a disk block which is in the tree. */
 inline int B_IS_IN_TREE(const struct buffer_head *p_s_bh)
--- olpc-2.6-master.00/fs/super.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/super.c	2007-03-01 11:52:20.000000000 -0500
@@ -37,6 +37,9 @@
 #include <linux/idr.h>
 #include <linux/kobject.h>
 #include <linux/mutex.h>
+#include <linux/devpts_fs.h>
+#include <linux/proc_fs.h>
+#include <linux/vs_context.h>
 #include <asm/uaccess.h>
 
 
--- olpc-2.6-master.00/fs/utimes.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/utimes.c	2007-03-01 11:52:20.000000000 -0500
@@ -4,6 +4,7 @@
 #include <linux/namei.h>
 #include <linux/sched.h>
 #include <linux/utime.h>
+#include <linux/vs_cowbl.h>
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
 
--- olpc-2.6-master.00/fs/xfs/linux-2.6/xfs_iops.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/xfs/linux-2.6/xfs_iops.c	2007-03-01 11:52:20.000000000 -0500
@@ -51,6 +51,7 @@
 #include <linux/xattr.h>
 #include <linux/namei.h>
 #include <linux/security.h>
+#include <linux/vs_tag.h>
 
 /*
  * Get a XFS inode from a given vnode.
--- olpc-2.6-master.00/fs/xfs/xfs_inode.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/xfs/xfs_inode.c	2007-03-01 11:52:20.000000000 -0500
@@ -49,6 +49,7 @@
 #include "xfs_quota.h"
 #include "xfs_acl.h"
 
+#include <linux/vs_tag.h>
 
 kmem_zone_t *xfs_ifork_zone;
 kmem_zone_t *xfs_inode_zone;
--- olpc-2.6-master.00/include/asm-arm/tlb.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/asm-arm/tlb.h	2007-03-01 11:52:20.000000000 -0500
@@ -28,6 +28,7 @@
 #else /* !CONFIG_MMU */
 
 #include <asm/pgalloc.h>
+#include <linux/vs_memory.h>
 
 /*
  * TLB handling.  This allows us to remove pages from the page
--- olpc-2.6-master.00/include/asm-arm26/tlb.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/asm-arm26/tlb.h	2007-03-01 11:52:20.000000000 -0500
@@ -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
--- olpc-2.6-master.00/include/asm-generic/tlb.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/asm-generic/tlb.h	2007-03-01 11:52:20.000000000 -0500
@@ -14,6 +14,7 @@
 #define _ASM_GENERIC__TLB_H
 
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 
--- olpc-2.6-master.00/include/asm-ia64/tlb.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/asm-ia64/tlb.h	2007-03-01 11:52:20.000000000 -0500
@@ -40,6 +40,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>
--- olpc-2.6-master.00/include/asm-sparc64/tlb.h	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/asm-sparc64/tlb.h	2007-03-01 11:52:20.000000000 -0500
@@ -2,6 +2,7 @@
 #define _SPARC64_TLB_H
 
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
 #include <asm/mmu_context.h>
--- olpc-2.6-master.00/include/linux/sched.h	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/linux/sched.h	2007-03-01 11:52:20.000000000 -0500
@@ -54,6 +55,7 @@ struct sched_param {
 #include <linux/cpumask.h>
 #include <linux/errno.h>
 #include <linux/nodemask.h>
+// #include <linux/vs_base.h>
 
 #include <asm/system.h>
 #include <asm/semaphore.h>
--- olpc-2.6-master.00/include/linux/time.h	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/linux/time.h	2007-03-01 11:52:20.000000000 -0500
@@ -175,6 +175,9 @@ static inline void timespec_add_ns(struc
 	}
 	a->tv_nsec = ns;
 }
+
+#include <linux/vs_time.h>
+
 #endif /* __KERNEL__ */
 
 #define NFDBITS			__NFDBITS
--- olpc-2.6-master.00/include/net/route.h	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/include/net/route.h	2007-03-01 17:09:59.000000000 -0500
@@ -33,6 +34,8 @@ *****
 #include <linux/ip.h>
 #include <linux/cache.h>
 #include <linux/security.h>
+#include <linux/vs_base.h>
+#include <linux/vs_inet.h>
 
 #ifndef __KERNEL__
 #warning This file is not supposed to be used outside of kernel.
--- olpc-2.6-master.00/ipc/mqueue.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/ipc/mqueue.c	2007-03-01 11:52:20.000000000 -0500
@@ -29,6 +29,8 @@
 #include <linux/audit.h>
 #include <linux/signal.h>
 #include <linux/mutex.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 
 #include <net/sock.h>
 #include "util.h"
--- olpc-2.6-master.00/ipc/sem.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/ipc/sem.c	2007-03-01 11:52:20.000000000 -0500
@@ -83,6 +83,8 @@
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
 #include <linux/nsproxy.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
 
 #include <asm/uaccess.h>
 #include "util.h"
--- olpc-2.6-master.00/ipc/shm.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/ipc/shm.c	2007-03-01 11:53:25.000000000 -0500
@@ -38,6 +38,8 @@
 #include <linux/mutex.h>
 #include <linux/nsproxy.h>
 #include <linux/mount.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 
 #include <asm/uaccess.h>
 
--- olpc-2.6-master.00/kernel/exit.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/exit.c	2007-03-01 11:52:20.000000000 -0500
@@ -42,6 +42,11 @@
 #include <linux/audit.h> /* for audit_free() */
 #include <linux/resource.h>
 #include <linux/blkdev.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_pid.h>
+#include <linux/vserver/global.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- olpc-2.6-master.00/kernel/fork.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/fork.c	2007-03-01 11:52:20.000000000 -0500
@@ -49,6 +49,11 @@
 #include <linux/delayacct.h>
 #include <linux/taskstats_kern.h>
 #include <linux/random.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
+#include <linux/vs_memory.h>
+#include <linux/vserver/global.h>
 
 #include <asm/pgtable.h>
 #include <asm/pgalloc.h>
--- olpc-2.6-master.00/kernel/nsproxy.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/nsproxy.c	2007-03-01 11:52:20.000000000 -0500
@@ -20,6 +20,7 @@
 #include <linux/mnt_namespace.h>
 #include <linux/utsname.h>
 #include <linux/pid_namespace.h>
+#include <linux/vserver/global.h>
 
 struct nsproxy init_nsproxy = INIT_NSPROXY(init_nsproxy);
 
--- olpc-2.6-master.00/kernel/pid.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/pid.c	2007-03-01 12:00:11.000000000 -0500
@@ -27,6 +27,7 @@
 #include <linux/bootmem.h>
 #include <linux/hash.h>
 #include <linux/pid_namespace.h>
+#include <linux/vs_pid.h>
 
 #define pid_hashfn(nr) hash_long((unsigned long)nr, pidhash_shift)
 static struct hlist_head *pid_hash;
--- olpc-2.6-master.00/kernel/posix-timers.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/posix-timers.c	2007-03-01 11:52:20.000000000 -0500
@@ -48,6 +48,7 @@
 #include <linux/wait.h>
 #include <linux/workqueue.h>
 #include <linux/module.h>
+#include <linux/vs_context.h>
 
 /*
  * Management arrays for POSIX timers.	 Timers are kept in slab memory
--- olpc-2.6-master.00/kernel/printk.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/printk.c	2007-03-01 11:52:20.000000000 -0500
@@ -32,6 +32,7 @@
 #include <linux/bootmem.h>
 #include <linux/syscalls.h>
 #include <linux/jiffies.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 
--- olpc-2.6-master.00/kernel/sched.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/sched.c	2007-03-01 11:52:20.000000000 -0500
@@ -55,6 +55,8 @@
 #include <asm/tlb.h>
 
 #include <asm/unistd.h>
+#include <linux/vs_sched.h>
+#include <linux/vs_cvirt.h>
 
 /*
  * Scheduler clock - returns current time in nanosec units.
--- olpc-2.6-master.00/kernel/signal.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/signal.c	2007-03-01 11:52:20.000000000 -0500
@@ -26,6 +26,7 @@
 #include <linux/freezer.h>
 #include <linux/pid_namespace.h>
 #include <linux/nsproxy.h>
+#include <linux/vs_context.h>
 
 #include <asm/param.h>
 #include <asm/uaccess.h>
--- olpc-2.6-master.00/kernel/softirq.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/softirq.c	2007-03-01 11:52:20.000000000 -0500
@@ -18,6 +18,7 @@
 #include <linux/rcupdate.h>
 #include <linux/smp.h>
 #include <linux/tick.h>
+#include <linux/vs_context.h>
 
 #include <asm/irq.h>
 /*
--- olpc-2.6-master.00/kernel/sys.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/sys.c	2007-03-01 11:52:20.000000000 -0500
@@ -33,6 +34,7 @@
 #include <linux/compat.h>
 #include <linux/syscalls.h>
 #include <linux/kprobes.h>
+#include <linux/vs_pid.h>
 
 #include <asm/uaccess.h>
 #include <asm/io.h>
--- olpc-2.6-master.00/kernel/timer.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/timer.c	2007-03-01 11:52:20.000000000 -0500
@@ -36,6 +36,10 @@
 #include <linux/delay.h>
 #include <linux/tick.h>
 #include <linux/kallsyms.h>
+#include <linux/vs_base.h>
+#include <linux/vs_cvirt.h>
+#include <linux/vs_pid.h>
+#include <linux/vserver/sched.h>
 
 #include <asm/uaccess.h>
 #include <asm/unistd.h>
--- olpc-2.6-master.00/kernel/utsname.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/utsname.c	2007-03-01 11:52:20.000000000 -0500
@@ -13,6 +13,7 @@
 #include <linux/uts.h>
 #include <linux/utsname.h>
 #include <linux/version.h>
+#include <linux/vserver/global.h>
 
 /*
  * Clone a new ns copying an original utsname, setting refcount to 1
--- olpc-2.6-master.00/mm/filemap_xip.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/filemap_xip.c	2007-03-01 11:52:20.000000000 -0500
@@ -13,6 +13,7 @@
 #include <linux/module.h>
 #include <linux/uio.h>
 #include <linux/rmap.h>
+#include <linux/vs_memory.h>
 #include <asm/tlbflush.h>
 #include "filemap.h"
 
--- olpc-2.6-master.00/mm/fremap.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/fremap.c	2007-03-01 11:52:20.000000000 -0500
@@ -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>
--- olpc-2.6-master.00/mm/hugetlb.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/hugetlb.c	2007-03-01 11:52:20.000000000 -0500
@@ -19,6 +19,7 @@
 #include <asm/pgtable.h>
 
 #include <linux/hugetlb.h>
+#include <linux/vs_memory.h>
 #include "internal.h"
 
 const unsigned long hugetlb_zero = 0, hugetlb_infinity = ~0UL;
--- olpc-2.6-master.00/mm/mlock.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/mlock.c	2007-03-01 11:52:20.000000000 -0500
@@ -10,6 +10,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,
--- olpc-2.6-master.00/mm/mremap.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/mremap.c	2007-03-01 11:52:20.000000000 -0500
@@ -18,6 +18,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>
--- olpc-2.6-master.00/mm/page_alloc.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/page_alloc.c	2007-03-01 11:52:20.000000000 -0500
@@ -41,6 +41,8 @@
 #include <linux/pfn.h>
 #include <linux/backing-dev.h>
 #include <linux/fault-inject.h>
+#include <linux/vs_base.h>
+#include <linux/vs_limit.h>
 
 #include <asm/tlbflush.h>
 #include <asm/div64.h>
--- olpc-2.6-master.00/mm/rmap.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/rmap.c	2007-03-01 11:52:20.000000000 -0500
@@ -48,6 +48,7 @@
 #include <linux/rcupdate.h>
 #include <linux/module.h>
 #include <linux/kallsyms.h>
+#include <linux/vs_memory.h>
 
 #include <asm/tlbflush.h>
 
--- olpc-2.6-master.00/mm/slab.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/slab.c	2007-03-01 11:52:20.000000000 -0500
@@ -502,6 +502,8 @@ struct kmem_cache {
 #define STATS_INC_FREEMISS(x)	do { } while (0)
 #endif
 
+#include "slab_vs.h"
+
 #if DEBUG
 
 /*
--- olpc-2.6-master.00/mm/swapfile.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/mm/swapfile.c	2007-03-01 11:52:20.000000000 -0500
@@ -31,6 +31,8 @@
 #include <asm/pgtable.h>
 #include <asm/tlbflush.h>
 #include <linux/swapops.h>
+#include <linux/vs_base.h>
+#include <linux/vs_memory.h>
 
 DEFINE_SPINLOCK(swap_lock);
 unsigned int nr_swapfiles;
--- olpc-2.6-master.00/net/core/dev.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/core/dev.c	2007-03-01 17:09:59.000000000 -0500
@@ -116,6 +116,7 @@
 #include <linux/dmaengine.h>
 #include <linux/err.h>
 #include <linux/ctype.h>
+#include <linux/vs_inet.h>
 
 /*
  *	The list of packet types we will receive (as opposed to discard)
--- olpc-2.6-master.00/net/core/sock.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/core/sock.c	2007-03-01 11:52:20.000000000 -0500
@@ -125,6 +125,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>
--- olpc-2.6-master.00/net/ipv4/af_inet.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/ipv4/af_inet.c	2007-03-01 11:52:20.000000000 -0500
@@ -115,6 +115,7 @@
 #ifdef CONFIG_IP_MROUTE
 #include <linux/mroute.h>
 #endif
+#include <linux/vs_limit.h>
 
 DEFINE_SNMP_STAT(struct linux_mib, net_statistics) __read_mostly;
 
--- olpc-2.6-master.00/net/ipv4/tcp_minisocks.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/ipv4/tcp_minisocks.c	2007-03-01 11:52:20.000000000 -0500
@@ -28,6 +28,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
--- olpc-2.6-master.00/net/netlink/af_netlink.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/netlink/af_netlink.c	2007-03-01 11:52:20.000000000 -0500
@@ -56,6 +56,9 @@
 #include <linux/types.h>
 #include <linux/audit.h>
 #include <linux/selinux.h>
+#include <linux/vs_context.h>
+#include <linux/vs_network.h>
+#include <linux/vs_limit.h>
 
 #include <net/sock.h>
 #include <net/scm.h>
--- olpc-2.6-master.00/net/socket.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/socket.c	2007-03-01 11:52:20.000000000 -0500
@@ -92,6 +92,8 @@
 
 #include <net/sock.h>
 #include <linux/netfilter.h>
+#include <linux/vs_base.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, const struct iovec *iov,
--- olpc-2.6-master.00/net/sunrpc/auth.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/sunrpc/auth.c	2007-03-01 11:52:20.000000000 -0500
@@ -13,6 +13,7 @@
 #include <linux/errno.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/spinlock.h>
+#include <linux/vs_tag.h>
 
 #ifdef RPC_DEBUG
 # define RPCDBG_FACILITY	RPCDBG_AUTH
--- olpc-2.6-master.00/net/sunrpc/auth_unix.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/sunrpc/auth_unix.c	2007-03-01 11:52:20.000000000 -0500
@@ -11,6 +11,7 @@
 #include <linux/module.h>
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/auth.h>
+#include <linux/vs_tag.h>
 
 #define NFS_NGROUPS	16
 
--- olpc-2.6-master.00/net/sunrpc/clnt.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/sunrpc/clnt.c	2007-03-01 11:52:20.000000000 -0500
@@ -30,6 +30,7 @@
 #include <linux/smp_lock.h>
 #include <linux/utsname.h>
 #include <linux/workqueue.h>
+#include <linux/vs_cvirt.h>
 
 #include <linux/sunrpc/clnt.h>
 #include <linux/sunrpc/rpc_pipe_fs.h>
--- olpc-2.6-master.00/net/unix/af_unix.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/net/unix/af_unix.c	2007-03-01 11:52:20.000000000 -0500
@@ -116,6 +116,8 @@
 #include <linux/mount.h>
 #include <net/checksum.h>
 #include <linux/security.h>
+#include <linux/vs_context.h>
+#include <linux/vs_limit.h>
 
 int sysctl_unix_max_dgram_qlen __read_mostly = 10;
 
--- olpc-2.6-master.00/fs/ioprio.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/ioprio.c	2007-03-01 11:52:20.000000000 -0500
@@ -25,6 +25,7 @@
 #include <linux/capability.h>
 #include <linux/syscalls.h>
 #include <linux/security.h>
+#include <linux/vs_base.h>
 
 static int set_task_ioprio(struct task_struct *task, int ioprio)
 {
--- olpc-2.6-master.00/ipc/util.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/ipc/util.c	2007-03-01 11:52:20.000000000 -0500
@@ -33,6 +33,8 @@
 #include <linux/proc_fs.h>
 #include <linux/audit.h>
 #include <linux/nsproxy.h>
+#include <linux/vs_base.h>
+#include <linux/vserver/global.h>
 
 #include <asm/unistd.h>
 
--- olpc-2.6-master.00/fs/xfs/quota/xfs_qm_syscalls.c	2007-02-28 20:05:28.000000000 -0500
+++ olpc-2.6-master-vs22x.02/fs/xfs/quota/xfs_qm_syscalls.c	2007-03-01 11:52:20.000000000 -0500
@@ -17,6 +17,7 @@
  */
 
 #include <linux/capability.h>
+#include <linux/vs_context.h>
 
 #include "xfs.h"
 #include "xfs_fs.h"
--- olpc-2.6-master.00/kernel/capability.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/kernel/capability.c	2007-03-01 11:52:20.000000000 -0500
@@ -12,6 +12,7 @@
 #include <linux/module.h>
 #include <linux/security.h>
 #include <linux/syscalls.h>
+#include <linux/vs_context.h>
 #include <asm/uaccess.h>
 
 unsigned securebits = SECUREBITS_DEFAULT; /* systemwide security settings */
--- olpc-2.6-master.00/security/commoncap.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/security/commoncap.c	2007-03-01 11:52:20.000000000 -0500
@@ -23,6 +23,7 @@
 #include <linux/ptrace.h>
 #include <linux/xattr.h>
 #include <linux/hugetlb.h>
+#include <linux/vs_context.h>
 
 int cap_netlink_send(struct sock *sk, struct sk_buff *skb)
 {
--- olpc-2.6-master.00/security/dummy.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/security/dummy.c	2007-03-01 11:52:20.000000000 -0500
@@ -28,6 +28,7 @@
 #include <linux/hugetlb.h>
 #include <linux/ptrace.h>
 #include <linux/file.h>
+#include <linux/vs_context.h>
 
 static int dummy_ptrace (struct task_struct *parent, struct task_struct *child)
 {
--- olpc-2.6-master.00/ipc/msg.c	2007-02-28 20:05:29.000000000 -0500
+++ olpc-2.6-master-vs22x.02/ipc/msg.c	2007-03-01 11:52:20.000000000 -0500
@@ -36,6 +36,7 @@
 #include <linux/seq_file.h>
 #include <linux/mutex.h>
 #include <linux/nsproxy.h>
+#include <linux/vs_base.h>
 
 #include <asm/current.h>
 #include <asm/uaccess.h>