xen, i386: Fix non-PAE build failure.

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
linux-2.6.18-xen changeset:   492:1327b9dcc63a9855b998fdc21269d4c9eeb557a3
linux-2.6.18-xen date:        Wed Mar 26 09:07:52 2008 +0000

diff --git a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
index 56067faaf230e2e66da1f5f73487d46c2eeee3e9..6f70049df4cf6b8389d1cac2034cefbfa09c4fa6 100644 (file)
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
@@ -134,9 +134,10 @@ typedef struct { unsigned long pgprot; } pgprot_t;
                    == _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); \