ia64/xen-unstable

changeset 6311:f3da3a14cafd

Fix put_pte_flags() for Xen PAE.

Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Sat Aug 20 11:14:28 2005 +0000 (2005-08-20)
parents 40d68c7d62d0
children 349c15288793
files xen/include/asm-x86/page.h xen/include/asm-x86/x86_32/page-3level.h
line diff
     1.1 --- a/xen/include/asm-x86/page.h	Sat Aug 20 10:03:40 2005 +0000
     1.2 +++ b/xen/include/asm-x86/page.h	Sat Aug 20 11:14:28 2005 +0000
     1.3 @@ -6,11 +6,7 @@
     1.4   * It is important that the masks are signed quantities. This ensures that
     1.5   * the compiler sign-extends a 32-bit mask to 64 bits if that is required.
     1.6   */
     1.7 -#ifndef __ASSEMBLY__
     1.8 -#define PAGE_SIZE           (1L << PAGE_SHIFT)
     1.9 -#else
    1.10  #define PAGE_SIZE           (1 << PAGE_SHIFT)
    1.11 -#endif
    1.12  #define PAGE_MASK           (~(PAGE_SIZE-1))
    1.13  #define PAGE_FLAG_MASK      (~0)
    1.14  
     2.1 --- a/xen/include/asm-x86/x86_32/page-3level.h	Sat Aug 20 10:03:40 2005 +0000
     2.2 +++ b/xen/include/asm-x86/x86_32/page-3level.h	Sat Aug 20 11:14:28 2005 +0000
     2.3 @@ -63,7 +63,7 @@ typedef l3_pgentry_t root_pgentry_t;
     2.4  
     2.5  /* Extract flags into 32-bit integer, or turn 32-bit flags into a pte mask. */
     2.6  #define get_pte_flags(x) (((int)((x) >> 32) & ~0xFFF) | ((int)(x) & 0xFFF))
     2.7 -#define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF))
     2.8 +#define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 32) | ((x) & 0xFFF))
     2.9  
    2.10  #define L1_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* PAT/GLOBAL */
    2.11  #define L2_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* PSE/GLOBAL */