Index: 2005-12-16/include/asm-i386/mmu.h
===================================================================
--- 2005-12-16.orig/include/asm-i386/mmu.h	2005-11-21 16:42:07.000000000 +0100
+++ 2005-12-16/include/asm-i386/mmu.h	2005-12-20 16:28:29.555603584 +0100
@@ -14,4 +14,10 @@ typedef struct { 
 	void *ldt;
 } mm_context_t;
 
+#ifdef CONFIG_X86_XEN
+/* mm/memory.c:exit_mmap hook */
+extern void _arch_exit_mmap(struct mm_struct *mm);
+#define arch_exit_mmap(_mm) _arch_exit_mmap(_mm)
+#endif
+
 #endif
Index: 2005-12-16/include/asm-i386/mach-xen/asm/mmu.h
===================================================================
--- 2005-12-16.orig/include/asm-i386/mach-xen/asm/mmu.h	2005-11-21 16:42:07.000000000 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-#ifndef __i386_MMU_H
-#define __i386_MMU_H
-
-#include <asm/semaphore.h>
-/*
- * The i386 doesn't have a mmu context, but
- * we put the segment information here.
- *
- * cpu_vm_mask is used to optimize ldt flushing.
- */
-typedef struct { 
-	int size;
-	struct semaphore sem;
-	void *ldt;
-} mm_context_t;
-
-/* mm/memory.c:exit_mmap hook */
-extern void _arch_exit_mmap(struct mm_struct *mm);
-#define arch_exit_mmap(_mm) _arch_exit_mmap(_mm)
-
-#endif