Defining PAGE_SIZE as int broke x86/64. Revert that change.

diff --git a/xen/include/asm-x86/page.h b/xen/include/asm-x86/page.h
index c242722888523b3b78abec540a7d1cd0c5c5a1d5..71edad153029a55e96bc5f8ea433db2829782813 100644 (file)
--- a/xen/include/asm-x86/page.h
+++ b/xen/include/asm-x86/page.h
@@ -6,7 +6,11 @@
  * 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.
  */
+#ifndef __ASSEMBLY__
+#define PAGE_SIZE           (1L << PAGE_SHIFT)
+#else
 #define PAGE_SIZE           (1 << PAGE_SHIFT)
+#endif
 #define PAGE_MASK           (~(PAGE_SIZE-1))
 #define PAGE_FLAG_MASK      (~0)