[Xen-changelog] Fix put_pte_flags() for Xen PAE.

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kaf24@xxxxxxxxxxxxxxxxxxxx
# Node ID f3da3a14cafd6bff4e6bb1dddcfa880b49b0b491
# Parent  40d68c7d62d07e75b84b91989c9ab25a0c21a186
Fix put_pte_flags() for Xen PAE.

Signed-off-by: Keir Fraser <keir@xxxxxxxxxxxxx>

diff -r 40d68c7d62d0 -r f3da3a14cafd xen/include/asm-x86/page.h
--- a/xen/include/asm-x86/page.h        Sat Aug 20 10:03:40 2005
+++ b/xen/include/asm-x86/page.h        Sat Aug 20 11:14:28 2005
@@ -6,11 +6,7 @@
  * 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)
 
diff -r 40d68c7d62d0 -r f3da3a14cafd xen/include/asm-x86/x86_32/page-3level.h
--- a/xen/include/asm-x86/x86_32/page-3level.h  Sat Aug 20 10:03:40 2005
+++ b/xen/include/asm-x86/x86_32/page-3level.h  Sat Aug 20 11:14:28 2005
@@ -63,7 +63,7 @@
 
 /* Extract flags into 32-bit integer, or turn 32-bit flags into a pte mask. */
 #define get_pte_flags(x) (((int)((x) >> 32) & ~0xFFF) | ((int)(x) & 0xFFF))
-#define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 40) | ((x) & 0xFFF))
+#define put_pte_flags(x) (((intpte_t)((x) & ~0xFFF) << 32) | ((x) & 0xFFF))
 
 #define L1_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* PAT/GLOBAL */
 #define L2_DISALLOW_MASK (0xFFFFF180U & ~_PAGE_NX) /* PSE/GLOBAL */

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