1 files changed, 22 insertions, 4 deletions
diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
index 9c628cd70e23..3f922c8e1c88 100644
--- a/include/asm-x86/mmu.h
+++ b/include/asm-x86/mmu.h
@@ -1,5 +1,23 @@
-#ifdef CONFIG_X86_32
+#ifndef _ASM_X86_MMU_H
-# include "mmu_32.h"
+#define _ASM_X86_MMU_H
-#else
-# include "mmu_64.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 */

diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h index 9c628cd70e23..3f922c8e1c88 100644 --- a/include/asm-x86/mmu.h +++ b/include/asm-x86/mmu.h
@@ -1,5 +1,23 @@
1	#ifdef CONFIG_X86_32	1	#ifndef _ASM_X86_MMU_H
2	# include "mmu_32.h"	2	#define _ASM_X86_MMU_H
3	#else	3
4	# include "mmu_64.h"	4	#include <linux/spinlock.h>
		5	#include <linux/mutex.h>
		6
		7	/*
		8	* The x86 doesn't have a mmu context, but
		9	* we put the segment information here.
		10	*
		11	* cpu_vm_mask is used to optimize ldt flushing.
		12	*/
		13	typedef struct {
		14	void *ldt;
		15	#ifdef CONFIG_X86_64
		16	rwlock_t ldtlock;
5	#endif	17	#endif
		18	int size;
		19	struct mutex lock;
		20	void *vdso;
		21	} mm_context_t;
		22
		23	#endif /* _ASM_X86_MMU_H */