Index: 2005-12-16/include/asm-i386/mach-xen/asm/pgalloc.h
===================================================================
--- 2005-12-16.orig/include/asm-i386/mach-xen/asm/pgalloc.h	2005-12-20 17:13:16.995050688 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,64 +0,0 @@
-#ifndef _I386_PGALLOC_H
-#define _I386_PGALLOC_H
-
-#include <linux/config.h>
-#include <asm/fixmap.h>
-#include <linux/threads.h>
-#include <linux/mm.h>		/* for struct page */
-#include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
-
-/* Is this pagetable pinned? */
-#define PG_pinned	PG_arch_1
-
-#define pmd_populate_kernel(mm, pmd, pte) \
-		set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
-
-#define pmd_populate(mm, pmd, pte) 					\
-do {									\
-	if (test_bit(PG_pinned, &virt_to_page((mm)->pgd)->flags)) {	\
-		if (!PageHighMem(pte))					\
-			BUG_ON(HYPERVISOR_update_va_mapping(		\
-			  (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT),\
-			  pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0));\
-		set_pmd(pmd, __pmd(_PAGE_TABLE +			\
-			((unsigned long long)page_to_pfn(pte) <<	\
-				(unsigned long long) PAGE_SHIFT)));	\
-	} else {							\
-		*(pmd) = __pmd(_PAGE_TABLE +				\
-			((unsigned long long)page_to_pfn(pte) <<	\
-				(unsigned long long) PAGE_SHIFT));	\
-	}								\
-} while (0)
-
-/*
- * Allocate and free page tables.
- */
-extern pgd_t *pgd_alloc(struct mm_struct *);
-extern void pgd_free(pgd_t *pgd);
-
-extern pte_t *pte_alloc_one_kernel(struct mm_struct *, unsigned long);
-extern struct page *pte_alloc_one(struct mm_struct *, unsigned long);
-
-static inline void pte_free_kernel(pte_t *pte)
-{
-	free_page((unsigned long)pte);
-	make_page_writable(pte);
-}
-
-extern void pte_free(struct page *pte);
-
-#define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))
-
-#ifdef CONFIG_X86_PAE
-/*
- * In the PAE case we free the pmds as part of the pgd.
- */
-#define pmd_alloc_one(mm, addr)		({ BUG(); ((pmd_t *)2); })
-#define pmd_free(x)			do { } while (0)
-#define __pmd_free_tlb(tlb,x)		do { } while (0)
-#define pud_populate(mm, pmd, pte)	BUG()
-#endif
-
-#define check_pgt_cache()	do { } while (0)
-
-#endif /* _I386_PGALLOC_H */
Index: 2005-12-16/include/asm-i386/pgalloc.h
===================================================================
--- 2005-12-16.orig/include/asm-i386/pgalloc.h	2005-12-20 17:13:16.994050840 +0100
+++ 2005-12-16/include/asm-i386/pgalloc.h	2005-12-20 17:47:25.658606488 +0100
@@ -5,14 +5,37 @@
 #include <asm/fixmap.h>
 #include <linux/threads.h>
 #include <linux/mm.h>		/* for struct page */
+#include <asm/io.h>		/* for phys_to_virt and page_to_pseudophys */
 
 #define pmd_populate_kernel(mm, pmd, pte) \
 		set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
 
+#ifndef CONFIG_X86_XEN
 #define pmd_populate(mm, pmd, pte) 				\
 	set_pmd(pmd, __pmd(_PAGE_TABLE +			\
 		((unsigned long long)page_to_pfn(pte) <<	\
 			(unsigned long long) PAGE_SHIFT)))
+#else
+/* Is this pagetable pinned? */
+#define PG_pinned	PG_arch_1
+#define pmd_populate(mm, pmd, pte) 					\
+do {									\
+	if (test_bit(PG_pinned, &virt_to_page((mm)->pgd)->flags)) {	\
+		if (!PageHighMem(pte))					\
+			BUG_ON(HYPERVISOR_update_va_mapping(		\
+			  (unsigned long)__va(page_to_pfn(pte)<<PAGE_SHIFT),\
+			  pfn_pte(page_to_pfn(pte), PAGE_KERNEL_RO), 0));\
+		set_pmd(pmd, __pmd(_PAGE_TABLE +			\
+			((unsigned long long)page_to_pfn(pte) <<	\
+				(unsigned long long) PAGE_SHIFT)));	\
+	} else {							\
+		*(pmd) = __pmd(_PAGE_TABLE +				\
+			((unsigned long long)page_to_pfn(pte) <<	\
+				(unsigned long long) PAGE_SHIFT));	\
+	}								\
+} while (0)
+#endif
+
 /*
  * Allocate and free page tables.
  */
@@ -25,13 +48,19 @@ extern struct page *pte_alloc_one(struct
 static inline void pte_free_kernel(pte_t *pte)
 {
 	free_page((unsigned long)pte);
+#ifdef CONFIG_X86_XEN
+	make_page_writable(pte);
+#endif
 }
 
+#ifndef CONFIG_X86_XEN
 static inline void pte_free(struct page *pte)
 {
 	__free_page(pte);
 }
-
+#else
+extern void pte_free(struct page *pte);
+#endif
 
 #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte))