diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/m32r/kernel/sys_m32r.c linux-2.6.12-vs2.0-rc4-uname/arch/m32r/kernel/sys_m32r.c
--- linux-2.6.12-vs2.0-rc4/arch/m32r/kernel/sys_m32r.c	2005-06-18 13:01:00.000000000 +0200
+++ linux-2.6.12-vs2.0-rc4-uname/arch/m32r/kernel/sys_m32r.c	2005-06-18 23:35:58.000000000 +0200
@@ -21,6 +21,7 @@
 #include <linux/mman.h>
 #include <linux/file.h>
 #include <linux/utsname.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 #include <asm/cachectl.h>
@@ -197,7 +198,7 @@ asmlinkage int sys_uname(struct old_utsn
 	if (!name)
 		return -EFAULT;
 	down_read(&uts_sem);
-	err=copy_to_user(name, &system_utsname, sizeof (*name));
+	err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
 	up_read(&uts_sem);
 	return err?-EFAULT:0;
 }
diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/mips/kernel/linux32.c linux-2.6.12-vs2.0-rc4-uname/arch/mips/kernel/linux32.c
--- linux-2.6.12-vs2.0-rc4/arch/mips/kernel/linux32.c	2005-06-18 13:37:24.000000000 +0200
+++ linux-2.6.12-vs2.0-rc4-uname/arch/mips/kernel/linux32.c	2005-06-18 23:41:55.000000000 +0200
@@ -37,6 +37,7 @@
 #include <linux/security.h>
 #include <linux/compat.h>
 #include <linux/vfs.h>
+#include <linux/vs_cvirt.h>
 
 #include <net/sock.h>
 #include <net/scm.h>
diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/ppc64/kernel/sys_ppc32.c linux-2.6.12-vs2.0-rc4-uname/arch/ppc64/kernel/sys_ppc32.c
--- linux-2.6.12-vs2.0-rc4/arch/ppc64/kernel/sys_ppc32.c	2005-06-18 13:27:17.000000000 +0200
+++ linux-2.6.12-vs2.0-rc4-uname/arch/ppc64/kernel/sys_ppc32.c	2005-06-18 23:40:28.000000000 +0200
@@ -60,6 +60,7 @@
 #include <linux/ptrace.h>
 #include <linux/aio_abi.h>
 #include <linux/elf.h>
+#include <linux/vs_cvirt.h>
 
 #include <net/scm.h>
 #include <net/sock.h>
diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/sh/kernel/sys_sh.c linux-2.6.12-vs2.0-rc4-uname/arch/sh/kernel/sys_sh.c
--- linux-2.6.12-vs2.0-rc4/arch/sh/kernel/sys_sh.c	2004-12-24 22:35:50.000000000 +0100
+++ linux-2.6.12-vs2.0-rc4-uname/arch/sh/kernel/sys_sh.c	2005-06-18 23:36:12.000000000 +0200
@@ -21,6 +21,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>
@@ -259,7 +260,7 @@ asmlinkage int sys_uname(struct old_utsn
 	if (!name)
 		return -EFAULT;
 	down_read(&uts_sem);
-	err=copy_to_user(name, &system_utsname, sizeof (*name));
+	err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
 	up_read(&uts_sem);
 	return err?-EFAULT:0;
 }
diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/sh64/kernel/sys_sh64.c linux-2.6.12-vs2.0-rc4-uname/arch/sh64/kernel/sys_sh64.c
--- linux-2.6.12-vs2.0-rc4/arch/sh64/kernel/sys_sh64.c	2005-06-18 13:01:00.000000000 +0200
+++ linux-2.6.12-vs2.0-rc4-uname/arch/sh64/kernel/sys_sh64.c	2005-06-18 23:36:19.000000000 +0200
@@ -29,6 +29,7 @@
 #include <linux/file.h>
 #include <linux/utsname.h>
 #include <linux/syscalls.h>
+#include <linux/vs_cvirt.h>
 #include <asm/uaccess.h>
 #include <asm/ipc.h>
 #include <asm/ptrace.h>
@@ -279,7 +280,7 @@ asmlinkage int sys_uname(struct old_utsn
 	if (!name)
 		return -EFAULT;
 	down_read(&uts_sem);
-	err=copy_to_user(name, &system_utsname, sizeof (*name));
+	err=copy_to_user(name, vx_new_utsname(), sizeof (*name));
 	up_read(&uts_sem);
 	return err?-EFAULT:0;
 }
diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/um/sys-x86_64/syscalls.c linux-2.6.12-vs2.0-rc4-uname/arch/um/sys-x86_64/syscalls.c
--- linux-2.6.12-vs2.0-rc4/arch/um/sys-x86_64/syscalls.c	2005-06-18 13:01:00.000000000 +0200
+++ linux-2.6.12-vs2.0-rc4-uname/arch/um/sys-x86_64/syscalls.c	2005-06-18 23:42:08.000000000 +0200
@@ -9,6 +9,7 @@
 #include "linux/shm.h"
 #include "linux/utsname.h"
 #include "linux/personality.h"
+#include "linux/vs_cvirt.h"
 #include "asm/uaccess.h"
 #define __FRAME_OFFSETS
 #include "asm/ptrace.h"
@@ -21,7 +22,7 @@ asmlinkage long sys_uname64(struct new_u
 {
 	int err;
 	down_read(&uts_sem);
-	err = copy_to_user(name, &system_utsname, sizeof (*name));
+	err = copy_to_user(name, vx_new_utsname(), sizeof (*name));
 	up_read(&uts_sem);
 	if (personality(current->personality) == PER_LINUX32)
 		err |= copy_to_user(&name->machine, "i686", 5);
diff -NurpP --minimal linux-2.6.12-vs2.0-rc4/arch/x86_64/ia32/sys_ia32.c linux-2.6.12-vs2.0-rc4-uname/arch/x86_64/ia32/sys_ia32.c
--- linux-2.6.12-vs2.0-rc4/arch/x86_64/ia32/sys_ia32.c	2005-06-18 13:37:24.000000000 +0200
+++ linux-2.6.12-vs2.0-rc4-uname/arch/x86_64/ia32/sys_ia32.c	2005-06-18 23:41:02.000000000 +0200
@@ -61,6 +61,7 @@
 #include <linux/ptrace.h>
 #include <linux/highuid.h>
 #include <linux/vmalloc.h>
+#include <linux/vs_cvirt.h>
 #include <asm/mman.h>
 #include <asm/types.h>
 #include <asm/uaccess.h>