--- linux-2.6.9/include/asm-i386/elf.h.orig	2008-07-10 11:09:41.614201000 -0700
+++ linux-2.6.9/include/asm-i386/elf.h	2008-07-10 11:16:06.452302000 -0700
@@ -141,11 +141,7 @@
 #define VSYSCALL_ENTRY	(VSYSCALL_BASE + VSYSCALL_OFFSET)
 
 /* kernel-internal fixmap address: */
-#ifdef CONFIG_XEN
-#define __VSYSCALL_BASE	(PAGE_OFFSET - 2*PAGE_SIZE)
-#else
 #define __VSYSCALL_BASE	(__fix_to_virt(FIX_VSYSCALL))
-#endif
 #define __VSYSCALL_EHDR	((const struct elfhdr *) __VSYSCALL_BASE)
 
 #ifdef CONFIG_XEN