[Xen-changelog] [xen-3.1-testing] xen, i386: Fix non-PAE build failure.

["Xen patchbot-3.1-testing" <patchbot-3.1-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1206524664 0
# Node ID 2f92fa17cf24cda089d71eb5ebd265b9f17a7688
# Parent  4e8d4c6fda77622ceac4d6c535dc0c2a33f3b025
xen, i386: Fix non-PAE build failure.
Signed-off-by: Keir Fraser <keir.fraser@xxxxxxxxxx>
linux-2.6.18-xen changeset:   492:1327b9dcc63a9855b998fdc21269d4c9eeb557a3
linux-2.6.18-xen date:        Wed Mar 26 09:07:52 2008 +0000
---
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff -r 4e8d4c6fda77 -r 2f92fa17cf24 
linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Wed Mar 26 
09:42:05 2008 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/page.h Wed Mar 26 
09:44:24 2008 +0000
@@ -134,9 +134,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