Index: linux-2.6.20-xen-r3/include/asm-i386/mach-xen/asm/pgtable-2level.h
===================================================================
--- linux-2.6.20-xen-r3.orig/include/asm-i386/mach-xen/asm/pgtable-2level.h
+++ linux-2.6.20-xen-r3/include/asm-i386/mach-xen/asm/pgtable-2level.h
@@ -30,8 +30,7 @@
 
 #define pte_none(x) (!(x).pte_low)
 
-#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-static inline pte_t ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
+static inline pte_t raw_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, pte_t *ptep)
 {
 	pte_t pte = *ptep;
 	if (!pte_none(pte)) {