ia64/xen-unstable

changeset 9034:55f597e929f3

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@suse.de>
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
author cl349@firebug.cl.cam.ac.uk
date Mon Feb 27 10:27:57 2006 +0000 (2006-02-27)
parents dbec76a720f8
children bf594e88f046
files linux-2.6-xen-sparse/include/asm-i386/fixmap.h linux-2.6-xen-sparse/include/asm-i386/page.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/include/asm-i386/fixmap.h	Mon Feb 27 10:26:01 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/fixmap.h	Mon Feb 27 10:27:57 2006 +0000
     1.3 @@ -52,7 +52,6 @@
     1.4   */
     1.5  enum fixed_addresses {
     1.6  	FIX_HOLE,
     1.7 -	FIX_VSYSCALL,
     1.8  #ifdef CONFIG_X86_LOCAL_APIC
     1.9  	FIX_APIC_BASE,	/* local (CPU) APIC) -- required for SMP or not */
    1.10  #endif
    1.11 @@ -116,14 +115,6 @@ extern void __set_fixmap (enum fixed_add
    1.12  #define __fix_to_virt(x)	(FIXADDR_TOP - ((x) << PAGE_SHIFT))
    1.13  #define __virt_to_fix(x)	((FIXADDR_TOP - ((x)&PAGE_MASK)) >> PAGE_SHIFT)
    1.14  
    1.15 -/*
    1.16 - * This is the range that is readable by user mode, and things
    1.17 - * acting like user mode such as get_user_pages.
    1.18 - */
    1.19 -#define FIXADDR_USER_START	(__fix_to_virt(FIX_VSYSCALL))
    1.20 -#define FIXADDR_USER_END	(FIXADDR_USER_START + PAGE_SIZE)
    1.21 -
    1.22 -
    1.23  extern void __this_fixmap_does_not_exist(void);
    1.24  
    1.25  /*
     2.1 --- a/linux-2.6-xen-sparse/include/asm-i386/page.h	Mon Feb 27 10:26:01 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/page.h	Mon Feb 27 10:27:57 2006 +0000
     2.3 @@ -139,6 +139,8 @@ extern int page_is_ram(unsigned long pag
     2.4  	((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \
     2.5  		 VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
     2.6  
     2.7 +#define __HAVE_ARCH_GATE_AREA 1
     2.8 +
     2.9  #endif /* __KERNEL__ */
    2.10  
    2.11  #include <asm-generic/page.h>