diff -NurpP --minimal linux-2.6.33-vs2.3.0.36.30.2/arch/um/include/asm/tlb.h linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/asm/tlb.h
--- linux-2.6.33-vs2.3.0.36.30.2/arch/um/include/asm/tlb.h	2009-09-10 15:25:46.000000000 +0200
+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/include/asm/tlb.h	2010-03-10 20:29:12.000000000 +0100
@@ -3,6 +3,7 @@
 
 #include <linux/pagemap.h>
 #include <linux/swap.h>
+#include <linux/vs_memory.h>
 #include <asm/percpu.h>
 #include <asm/pgalloc.h>
 #include <asm/tlbflush.h>
diff -NurpP --minimal linux-2.6.33-vs2.3.0.36.30.2/arch/um/Kconfig.rest linux-2.6.33-vs2.3.0.36.30.3/arch/um/Kconfig.rest
--- linux-2.6.33-vs2.3.0.36.30.2/arch/um/Kconfig.rest	2009-06-11 17:12:19.000000000 +0200
+++ linux-2.6.33-vs2.3.0.36.30.3/arch/um/Kconfig.rest	2010-03-10 20:23:16.000000000 +0100
@@ -18,6 +18,8 @@ source "drivers/connector/Kconfig"
 
 source "fs/Kconfig"
 
+source "kernel/vserver/Kconfig"
+
 source "security/Kconfig"
 
 source "crypto/Kconfig"