# HG changeset patch
# User "Jun Nakajima <jun.nakajima@intel.com>"
# Node ID 4adaea8679cf0bb935a4bd6ee16d48e02d60e55a
# Parent  b6ededee6dc997ebe379aeb9c647ca6d43a96b8d
Disabling vgettimeofday.

diff -r b6ededee6dc9 -r 4adaea8679cf linux-2.6-xen-sparse/arch/xen/x86_64/kernel/vsyscall.c
--- a/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/vsyscall.c	Sun Aug 21 17:06:08 2005
+++ b/linux-2.6-xen-sparse/arch/xen/x86_64/kernel/vsyscall.c	Mon Aug 22 06:45:10 2005
@@ -209,7 +209,7 @@
 
 	__set_fixmap(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
 }
-
+#ifdef CONFIG_XEN
 extern void __set_fixmap_user (enum fixed_addresses, unsigned long, pgprot_t);
 
 static void __init map_vsyscall_user(void)
@@ -219,7 +219,7 @@
 
 	__set_fixmap_user(VSYSCALL_FIRST_PAGE, physaddr_page0, PAGE_KERNEL_VSYSCALL);
 }
-
+#endif
 static int __init vsyscall_init(void)
 {
 	BUG_ON(((unsigned long) &vgettimeofday !=
@@ -227,7 +227,10 @@
 	BUG_ON((unsigned long) &vtime != VSYSCALL_ADDR(__NR_vtime));
 	BUG_ON((VSYSCALL_ADDR(0) != __fix_to_virt(VSYSCALL_FIRST_PAGE)));
 	map_vsyscall();
+#ifdef CONFIG_XEN
         map_vsyscall_user();    /* establish tranlation for user address space */
+	sysctl_vsyscall = 0;	/* need to disable do_vgettimeofday */
+#endif
 #ifdef CONFIG_SYSCTL
 	register_sysctl_table(kernel_root_table2, 0);
 #endif