===== linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c 1.7 vs edited =====
--- 1.7/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c	2005-05-12 10:17:01 -07:00
+++ edited/linux-2.6.11-xen-sparse/arch/xen/x86_64/mm/init.c	2005-05-12 14:32:18 -07:00
@@ -332,7 +332,7 @@
 	pte = pte_offset_kernel(pmd, vaddr);
 
 	if (!pte_none(*pte) &&
-	    pte_val(*pte) != (pte_val(new_pte) & __supported_pte_mask))
+	    pte_val_ma(*pte) != (pte_val_ma(new_pte) & __supported_pte_mask))
 		pte_ERROR(*pte);
 
         /* 
===== linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h 1.2 vs edited =====
--- 1.2/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h	2005-04-02 12:27:09 -08:00
+++ edited/linux-2.6.11-xen-sparse/include/asm-xen/asm-x86_64/page.h	2005-05-12 14:26:58 -07:00
@@ -92,6 +92,7 @@
 
 #define pte_val(x)	(((x).pte & 1) ? machine_to_phys((x).pte) : \
 			 (x).pte)
+#define pte_val_ma(x)	((x).pte)
 
 static inline unsigned long pmd_val(pmd_t x)
 {