--- linux-source-2.6.15-19.29-vs2.0.1.3.orig/arch/i386/Kconfig	2006-03-25 09:57:58.000000000 -0600
+++ linux-source-2.6.15-19.29-vs2.0.1.3/arch/i386/Kconfig	2006-03-25 09:06:49.000000000 -0600
@@ -478,46 +478,6 @@ config HIGHMEM64G
 
 endchoice
 
-choice
-	prompt "Memory Split User Space"
-	default SPLIT_3GB
-	help
-	  A different Userspace/Kernel split allows you to
-	  utilize up to alsmost 3GB of RAM without the requirement
-	  for HIGHMEM. It also increases the available lowmem.
-
-config SPLIT_3GB
-	bool "3.0GB/1.0GB Kernel (Default)"
-	help
-	  This is the default split of 3GB userspace to 1GB kernel
-	  space, which will result in about 860MB of lowmem.
-
-config SPLIT_25GB
-	bool "2.5GB/1.5GB Kernel"
-	help
-	  This split provides 2.5GB userspace and 1.5GB kernel
-	  space, which will result in about 1370MB of lowmem.
-
-config SPLIT_2GB
-	bool "2.0GB/2.0GB Kernel"
-	help
-	  This split provides 2GB userspace and 2GB kernel
-	  space, which will result in about 1880MB of lowmem.
-
-config SPLIT_15GB
-	bool "1.5GB/2.5GB Kernel"
-	help
-	  This split provides 1.5GB userspace and 2.5GB kernel
-	  space, which will result in about 2390MB of lowmem.
-
-config SPLIT_1GB
-	bool "1.0GB/3.0GB Kernel"
-	help
-	  This split provides 1GB userspace and 3GB kernel
-	  space, which will result in about 2900MB of lowmem.
-
-endchoice
-
 config HIGHMEM
 	bool
 	depends on HIGHMEM64G || HIGHMEM4G
--- linux-source-2.6.15-19.29-vs2.0.1.3.orig/arch/sparc64/kernel/sys_sparc.c	2006-03-25 09:57:58.000000000 -0600
+++ linux-source-2.6.15-19.29-vs2.0.1.3/arch/sparc64/kernel/sys_sparc.c	2006-03-25 08:16:59.000000000 -0600
@@ -26,6 +26,7 @@
 #include <linux/ipc.h>
 #include <linux/personality.h>
 #include <linux/random.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
--- linux-source-2.6.15-19.29-vs2.0.1.3.orig/drivers/block/Makefile	2006-03-25 09:57:58.000000000 -0600
+++ linux-source-2.6.15-19.29-vs2.0.1.3/drivers/block/Makefile	2006-03-25 08:17:46.000000000 -0600
@@ -32,3 +32,4 @@ obj-$(CONFIG_VIODASD)		+= viodasd.o
 obj-$(CONFIG_BLK_DEV_SX8)	+= sx8.o
 obj-$(CONFIG_BLK_DEV_UB)	+= ub.o
 obj-$(CONFIG_BLK_DEV_GNBD)	+= gnbd.o
+obj-$(CONFIG_BLK_DEV_VROOT)	+= vroot.o
--- linux-source-2.6.15-19.29-vs2.0.1.3.orig/include/asm-i386/page.h	2006-03-25 09:57:59.000000000 -0600
+++ linux-source-2.6.15-19.29-vs2.0.1.3/include/asm-i386/page.h	2006-03-25 08:47:04.000000000 -0600
@@ -115,18 +115,15 @@ extern int devmem_is_allowed(unsigned lo
 
 #define __PAGE_OFFSET		(PAGE_OFFSET_RAW)
 
-#ifdef __ASSEMBLY__
 #define __PHYSICAL_START	CONFIG_PHYSICAL_START
-#else
-#define __PHYSICAL_START	((unsigned long)CONFIG_PHYSICAL_START)
-#endif
-
 #define __KERNEL_START		(__PAGE_OFFSET + __PHYSICAL_START)
+#define __MAXMEM		(-__PAGE_OFFSET-__VMALLOC_RESERVE)
 
 
 #define PAGE_OFFSET		((unsigned long)__PAGE_OFFSET)
+#define PHYSICAL_START		((unsigned long)__PHYSICAL_START)
 #define VMALLOC_RESERVE		((unsigned long)__VMALLOC_RESERVE)
-#define MAXMEM			(-__PAGE_OFFSET-__VMALLOC_RESERVE)
+#define MAXMEM			((unsigned long)__MAXMEM)
 #define __pa(x)			((unsigned long)(x)-PAGE_OFFSET)
 #define __va(x)			((void *)((unsigned long)(x)+PAGE_OFFSET))
 #define pfn_to_kaddr(pfn)      __va((pfn) << PAGE_SHIFT)
--- linux-source-2.6.15-19.29-vs2.0.1.3.orig/kernel/sys.c	2006-03-25 09:57:59.000000000 -0600
+++ linux-source-2.6.15-19.29-vs2.0.1.3/kernel/sys.c	2006-03-25 08:28:57.000000000 -0600
@@ -467,6 +467,9 @@ void kernel_power_off(void)
 	machine_power_off();
 }
 EXPORT_SYMBOL_GPL(kernel_power_off);
+
+long vs_reboot(unsigned int, void *);
+
 /*
  * Reboot system call: for obvious reasons only root may call it,
  * and even root needs to set up some magic numbers in the registers
@@ -491,6 +494,9 @@ asmlinkage long sys_reboot(int magic1, i
 	                magic2 != LINUX_REBOOT_MAGIC2C))
 		return -EINVAL;
 
+	if (!vx_check(0, VX_ADMIN|VX_WATCH))
+		return vs_reboot(cmd, arg);
+
 	lock_kernel();
 	switch (cmd) {
 	case LINUX_REBOOT_CMD_RESTART:
@@ -554,8 +560,6 @@ static void deferred_cad(void *dummy)
 	kernel_restart(NULL);
 }
 
-long vs_reboot(unsigned int, void *);
-
 /*
  * This function gets called by ctrl-alt-del - ie the keyboard interrupt.
  * As it's called within an interrupt, it may NOT sync: the only choice