Merge branch 'for-2.6.24' of master.kernel.org:/pub/scm/linux/kernel/git/olof/pasemi...

[linux-2.6-omap-h63xx.git] / include / asm-x86 / mmu.h

diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
index 9c628cd70e23b850fd8c2666a2199b469e4eed96..3f922c8e1c881fcba9f779c75648d54225f15481 100644 (file)
--- a/include/asm-x86/mmu.h
+++ b/include/asm-x86/mmu.h
@@ -1,5 +1,23 @@
-#ifdef CONFIG_X86_32
-# include "mmu_32.h"
-#else
-# include "mmu_64.h"
+#ifndef _ASM_X86_MMU_H
+#define _ASM_X86_MMU_H
+
+#include <linux/spinlock.h>
+#include <linux/mutex.h>
+
+/*
+ * The x86 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;
+#ifdef CONFIG_X86_64
+       rwlock_t ldtlock; 
 #endif
+       int size;
+       struct mutex lock;
+       void *vdso;
+} mm_context_t;
+
+#endif /* _ASM_X86_MMU_H */