[Xen-changelog] Fix non-xen build for: Move the gate page (vsyscall) out of the fixmap area

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User cl349@xxxxxxxxxxxxxxxxxxxx
# Node ID 55f597e929f341eade781048db9da77a0352820d
# Parent  dbec76a720f8d79aa9dfcdb9e91684b7426a23f9
Fix non-xen build for: Move the gate page (vsyscall) out of the fixmap area
into user address space, just below PAGE_OFFSET.

From: Gerd Hoffmann <kraxel@xxxxxxx>
Signed-off-by: Christian Limpach <Christian.Limpach@xxxxxxxxxxxx>

diff -r dbec76a720f8 -r 55f597e929f3 
linux-2.6-xen-sparse/include/asm-i386/fixmap.h
--- a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h    Mon Feb 27 10:26:01 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h    Mon Feb 27 10:27:57 2006
@@ -52,7 +52,6 @@
  */
 enum fixed_addresses {
        FIX_HOLE,
-       FIX_VSYSCALL,
 #ifdef CONFIG_X86_LOCAL_APIC
        FIX_APIC_BASE,  /* local (CPU) APIC) -- required for SMP or not */
 #endif
@@ -116,14 +115,6 @@
 #define __fix_to_virt(x)       (FIXADDR_TOP - ((x) << PAGE_SHIFT))
 #define __virt_to_fix(x)       ((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
 
-/*
- * This is the range that is readable by user mode, and things
- * acting like user mode such as get_user_pages.
- */
-#define FIXADDR_USER_START     (__fix_to_virt(FIX_VSYSCALL))
-#define FIXADDR_USER_END       (FIXADDR_USER_START + PAGE_SIZE)
-
-
 extern void __this_fixmap_does_not_exist(void);
 
 /*
diff -r dbec76a720f8 -r 55f597e929f3 
linux-2.6-xen-sparse/include/asm-i386/page.h
--- a/linux-2.6-xen-sparse/include/asm-i386/page.h      Mon Feb 27 10:26:01 2006
+++ b/linux-2.6-xen-sparse/include/asm-i386/page.h      Mon Feb 27 10:27:57 2006
@@ -139,6 +139,8 @@
        ((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
                 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
 
+#define __HAVE_ARCH_GATE_AREA 1
+
 #endif /* __KERNEL__ */
 
 #include <asm-generic/page.h>

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog