ia64/xen-unstable

changeset 5537:15498ad4f5e0

bitkeeper revision 1.1726.1.2 (42b9799cvxl7PK_CkhwRTPueXP17ew)

Fix defintion of PAGE_MASK so that pae builds again.
Signed-off-by: Keir Fraser <keir@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Jun 22 14:45:48 2005 +0000 (2005-06-22)
parents 1bbb7875ee6a
children 52010370d2ed 2cadc83e2306
files xen/include/asm-x86/page.h
line diff
     1.1 --- a/xen/include/asm-x86/page.h	Wed Jun 22 14:18:12 2005 +0000
     1.2 +++ b/xen/include/asm-x86/page.h	Wed Jun 22 14:45:48 2005 +0000
     1.3 @@ -2,13 +2,13 @@
     1.4  #ifndef __X86_PAGE_H__
     1.5  #define __X86_PAGE_H__
     1.6  
     1.7 -#ifndef __ASSEMBLY__
     1.8 -#define PAGE_SIZE           (1UL << PAGE_SHIFT)
     1.9 -#else
    1.10 +/*
    1.11 + * It is important that the masks are signed quantities. This ensures that
    1.12 + * the compiler sign-extends a 32-bit mask to 64 bits if that is required.
    1.13 + */
    1.14  #define PAGE_SIZE           (1 << PAGE_SHIFT)
    1.15 -#endif
    1.16 -#define PAGE_MASK           (~(intpte_t)(PAGE_SIZE-1))
    1.17 -#define PAGE_FLAG_MASK      (~0U)
    1.18 +#define PAGE_MASK           (~(PAGE_SIZE-1))
    1.19 +#define PAGE_FLAG_MASK      (~0)
    1.20  
    1.21  #ifndef __ASSEMBLY__
    1.22  # include <asm/types.h>