Index: 2006-01-05/include/asm-x86_64/mach-xen/asm/mmu.h
===================================================================
--- 2006-01-05.orig/include/asm-x86_64/mach-xen/asm/mmu.h	2006-01-06 11:47:20.182768704 +0100
+++ /dev/null	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-#ifndef __x86_64_MMU_H
-#define __x86_64_MMU_H
-
-#include <linux/spinlock.h>
-#include <asm/semaphore.h>
-
-/*
- * The x86_64 doesn't have a mmu context, but
- * we put the segment information here.
- *
- * cpu_vm_mask is used to optimize ldt flushing.
- */
-typedef struct { 
-	void *ldt;
-	rwlock_t ldtlock; 
-	int size;
-	struct semaphore sem; 
-#ifdef CONFIG_XEN
-	unsigned pinned:1;
-	struct list_head unpinned;
-#endif
-} mm_context_t;
-
-#ifdef CONFIG_XEN
-extern struct list_head mm_unpinned;
-extern spinlock_t mm_unpinned_lock;
-
-/* 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: 2006-01-05/include/asm-x86_64/mmu.h
===================================================================
--- 2006-01-05.orig/include/asm-x86_64/mmu.h	2006-01-06 11:47:20.181768856 +0100
+++ 2006-01-05/include/asm-x86_64/mmu.h	2006-01-06 09:58:33.000000000 +0100
@@ -15,6 +15,19 @@ typedef struct { 
 	rwlock_t ldtlock; 
 	int size;
 	struct semaphore sem; 
+#ifdef CONFIG_XEN
+	unsigned pinned:1;
+	struct list_head unpinned;
+#endif
 } mm_context_t;
 
+#ifdef CONFIG_XEN
+extern struct list_head mm_unpinned;
+extern spinlock_t mm_unpinned_lock;
+
+/* 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