--- include/asm-xen/asm-i386/page.h.orig	2005-05-01 07:08:44.000000000 +0000
+++ include/asm-xen/asm-i386/page.h	2005-05-01 07:21:09.000000000 +0000
@@ -92,18 +92,7 @@ typedef struct { unsigned long long pgpr
     (((_x)&1) ? ((pgd_t) {phys_to_machine(_x)}) : ((pgd_t) {(_x)})); })
 #define __pmd(x) ({ unsigned long long _x = (x); \
     (((_x)&1) ? ((pmd_t) {phys_to_machine(_x)}) : ((pmd_t) {(_x)})); })
-static inline unsigned long long pte_val(pte_t x)
-{
-	unsigned long long ret;
-
-	if (x.pte_low) {
-		ret = x.pte_low | (unsigned long long)x.pte_high << 32;
-		ret = machine_to_phys(ret) | 1;
-	} else {
-		ret = 0;
-	}
-	return ret;
-}
+#define pte_val(x) ((x).pte_low | (unsigned long long)(x).pte_high << 32)
 static inline unsigned long long pmd_val(pmd_t x)
 {
 	unsigned long long ret = x.pmd;