[Xen-changelog] Fix defintion of PAGE_MASK so that pae builds again.

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1728, 2005/06/22 15:45:48+01:00, kaf24@xxxxxxxxxxxxxxxxxxxx

        Fix defintion of PAGE_MASK so that pae builds again.
        Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>



 page.h |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)


diff -Nru a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
--- a/xen/include/asm-x86/page.h        2005-06-22 11:03:16 -04:00
+++ b/xen/include/asm-x86/page.h        2005-06-22 11:03:16 -04:00
@@ -2,13 +2,13 @@
 #ifndef __X86_PAGE_H__
 #define __X86_PAGE_H__
 
-#ifndef __ASSEMBLY__
-#define PAGE_SIZE           (1UL << PAGE_SHIFT)
-#else
+/*
+ * It is important that the masks are signed quantities. This ensures that
+ * the compiler sign-extends a 32-bit mask to 64 bits if that is required.
+ */
 #define PAGE_SIZE           (1 << PAGE_SHIFT)
-#endif
-#define PAGE_MASK           (~(intpte_t)(PAGE_SIZE-1))
-#define PAGE_FLAG_MASK      (~0U)
+#define PAGE_MASK           (~(PAGE_SIZE-1))
+#define PAGE_FLAG_MASK      (~0)
 
 #ifndef __ASSEMBLY__
 # include <asm/types.h>

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