hand-edited.
/wt

diff -urN linux-2.4.25-wt7-vs1.27/arch/i386/kernel/entry.S linux-2.4.25-wt7-vs1.27-fix/arch/i386/kernel/entry.S
--- linux-2.4.25-wt7-vs1.27/arch/i386/kernel/entry.S	Thu Mar 25 10:26:20 2004
+++ linux-2.4.25-wt7-vs1.27-fix/arch/i386/kernel/entry.S	Thu Mar 25 10:37:23 2004
@@ -718,10 +718,25 @@
 	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_exit_group */
 	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_lookup_dcookie */
 	.long SYMBOL_NAME(sys_epoll_create)	/* sys_epoll_create */
-	.long SYMBOL_NAME(sys_epoll_ctl)	/* sys_epoll_ctl 255 */
+	.long SYMBOL_NAME(sys_epoll_ctl)	/* 255 sys_epoll_ctl */
 	.long SYMBOL_NAME(sys_epoll_wait)	/* sys_epoll_wait */
  	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_remap_file_pages */
  	.long SYMBOL_NAME(sys_ni_syscall)	/* sys_set_tid_address */
+	.long SYMBOL_NAME(sys_ni_syscall)	
+	.long SYMBOL_NAME(sys_ni_syscall)	/* 260 */
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)	/* 265 */
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)	/* 270 */
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_ni_syscall)
+	.long SYMBOL_NAME(sys_vserver)		/* 273 sys_vserver */
 
 	.rept NR_syscalls-(.-sys_call_table)/4
 		.long SYMBOL_NAME(sys_ni_syscall)
diff -urN linux-2.4.25-wt7-vs1.27/fs/Makefile linux-2.4.25-wt7-vs1.27-fix/fs/Makefile
--- linux-2.4.25-wt7-vs1.27/fs/Makefile	Thu Mar 25 10:26:20 2004
+++ linux-2.4.25-wt7-vs1.27-fix/fs/Makefile	Thu Mar 25 10:34:10 2004
@@ -7,7 +7,7 @@
 
 O_TARGET := fs.o
 
-export-objs :=	filesystems.o open.o dcache.o buffer.o dquot.o exec.o
+export-objs :=	filesystems.o open.o dcache.o buffer.o dquot.o exec.o quota.o
 mod-subdirs :=	nls
 
 obj-y :=	open.o read_write.o devices.o file_table.o buffer.o \
--- ./fs/proc/array.c~	Sat Apr 17 22:33:17 2004
+++ ./fs/proc/array.c	Sat Apr 17 22:36:58 2004
@@ -273,11 +273,15 @@
 {
     return buffer + sprintf(buffer, "CapInh:\t%016x\n"
 			    "CapPrm:\t%016x\n"
-			    "CapEff:\t%016x\n",
+			    "CapEff:\t%016x\n"
+			    "CapBset:\t%016x\n",
 			    cap_t(p->cap_inheritable),
 			    cap_t(p->cap_permitted),
-			    cap_t(p->cap_effective));
+			    cap_t(p->cap_effective),
+			    cap_t(p->cap_bset));
 }
+
+extern rwlock_t ctx_ref_lock;
 
 #if defined(CONFIG_PAX_NOEXEC) || defined(CONFIG_PAX_ASLR)
 static inline char *task_pax(struct task_struct *p, char *buffer)
diff -urN linux-2.4.25-wt7-vs1.27/kernel/signal.c linux-2.4.25-wt7-vs1.27-fix/kernel/signal.c
--- ./include/linux/sysctl.h.orig	Sun May  9 16:10:11 2004
+++ ./include/linux/sysctl.h	Sun May  9 16:10:44 2004
@@ -129,6 +129,7 @@
 	KERN_PPC_L3CR=57,       /* l3cr register on PPC */
 	KERN_EXCEPTION_TRACE=58, /* boolean: exception trace */
  	KERN_CORE_SETUID=59,	/* int: set to allow core dumps of setuid apps */
+	KERN_VSHELPER=60,	/* string: path to vshelper policy agent */
 	KERN_SPARC_SCONS_PWROFF=64, /* int: serial console power-off halt */
 
 #ifdef CONFIG_PAX_SOFTMODE
--- linux-2.4.25-wt7-vs1.27/kernel/signal.c	Thu Mar 25 10:26:20 2004
+++ linux-2.4.25-wt7-vs1.27-fix/kernel/signal.c	Thu Mar 25 10:37:56 2004
@@ -13,6 +13,7 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/sched.h>
+#include <linux/vswitch.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 
diff -urN linux-2.4.25-wt7-vs1.27/kernel/sys.c linux-2.4.25-wt7-vs1.27-fix/kernel/sys.c
--- linux-2.4.25-wt7-vs1.27/kernel/sys.c	Thu Mar 25 10:26:20 2004
+++ linux-2.4.25-wt7-vs1.27-fix/kernel/sys.c	Thu Mar 25 10:38:42 2004
@@ -6,14 +6,17 @@
 
 #include <linux/module.h>
 #include <linux/mm.h>
+#include <linux/vmalloc.h>
 #include <linux/utsname.h>
 #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>
 #include <linux/highuid.h>
+#include <linux/vcontext.h>
 #include <asm/param.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
diff -urN linux-2.4.25-wt7-vs1.27/kernel/sysctl.c linux-2.4.25-wt7-vs1.27-fix/kernel/sysctl.c
--- linux-2.4.25-wt7-vs1.27/kernel/sysctl.c	Thu Mar 25 10:26:20 2004
+++ linux-2.4.25-wt7-vs1.27-fix/kernel/sysctl.c	Thu Mar 25 10:39:52 2004
@@ -289,6 +289,9 @@
 	 &exception_trace,sizeof(int),0644,NULL,&proc_dointvec},
 #endif	
 
+	{KERN_VSHELPER,"vshelper",
+	 &vshelper_path,256,0644,NULL,&proc_dostring,&sysctl_string},
+
 #ifdef CONFIG_PAX_SOFTMODE
 	{KERN_PAX,"pax",NULL,0,0500,pax_table},
 #endif
--- ./drivers/block/Makefile.orig	Thu Apr 22 16:21:45 2004
+++ ./drivers/block/Makefile	Fri Apr 23 09:34:44 2004
@@ -32,6 +32,7 @@
 obj-$(CONFIG_BLK_DEV_UMEM)	+= umem.o
 obj-$(CONFIG_BLK_DEV_NBD)	+= nbd.o
 obj-$(CONFIG_BLK_DEV_CARMEL)	+= carmel.o
+obj-$(CONFIG_BLK_DEV_VROOT)	+= vroot.o
 
 subdir-$(CONFIG_PARIDE) += paride