* looking for pae@localhost/linux--pae--1.0--patch-2 to compare with
* comparing to pae@localhost/linux--pae--1.0--patch-2
M  include/asm-xen/asm-i386/page.h
M  include/asm-xen/asm-i386/pgtable-3level.h

* modified files

--- orig/include/asm-xen/asm-i386/page.h
+++ mod/include/asm-xen/asm-i386/page.h
@@ -116,7 +116,10 @@
 	if (ret) ret = machine_to_phys(ret) | 1;
 	return ret;
 }
-#define pte_val_ma(v) ((v).pte_low) /* FIXME */
+static inline unsigned long long pte_val_ma(pte_t x)
+{
+	return (unsigned long long)x.pte_high << 32 | x.pte_low;
+}
 #define HPAGE_SHIFT	21
 #else
 typedef struct { unsigned long pte_low; } pte_t;


--- orig/include/asm-xen/asm-i386/pgtable-3level.h
+++ mod/include/asm-xen/asm-i386/pgtable-3level.h
@@ -60,7 +60,7 @@
 	ptep->pte_low = pte.pte_low;
 }
 # define set_pte_atomic(pteptr,pteval) \
-		set_64bit((unsigned long long *)(pteptr),pte_val(pteval))
+		set_64bit((unsigned long long *)(pteptr),pte_val_ma(pteval))
 #else
 # define set_pte(pteptr,pteval)				\
 		xen_l1_entry_update((pteptr), (pteval))