[Xen-changelog] [linux-2.6.18-xen] xen, i386: Fix non-PAE build failure.

["Xen patchbot-linux-2.6.18-xen" <patchbot-linux-2.6.18-xen@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206522472 0
# Node ID 1327b9dcc63a9855b998fdc21269d4c9eeb557a3
# Parent  92f7b3144f4121275eab4923755926cb267c42b4
xen, i386: Fix non-PAE build failure.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
---
 include/asm-i386/mach-xen/asm/page.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r 92f7b3144f41 -r 1327b9dcc63a include/asm-i386/mach-xen/asm/page.h
--- a/include/asm-i386/mach-xen/asm/page.h      Wed Mar 26 08:54:24 2008 +0000
+++ b/include/asm-i386/mach-xen/asm/page.h      Wed Mar 26 09:07:52 2008 +0000
@@ -126,9 +126,10 @@ typedef struct { unsigned long pgprot; }
                    == _PAGE_PRESENT ?                          \
                    machine_to_phys(__pte_val(x)) :             \
                    __pte_val(x))
-#define __pte(x) ({ unsigned long _x = (x);                            \
-    (pte_t)(((_x) & (_PAGE_PRESENT|_PAGE_IO)) == _PAGE_PRESENT ?       \
-    phys_to_machine(_x) : (_x)); })
+#define __pte(x) ({ unsigned long _x = (x);                    \
+    if ((_x & (_PAGE_PRESENT|_PAGE_IO)) == _PAGE_PRESENT)      \
+        _x = phys_to_machine(_x);                              \
+    ((pte_t) { _x }); })
 #define __pmd_val(x) __pud_val((x).pud)
 #define __pud_val(x) __pgd_val((x).pgd)
 #define __pgd(x) ({ unsigned long _x = (x); \

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