---

yaml --- r: 72356 b: refs/heads/master c: 7035302 h: refs/heads/master v: v3
git-mirror · Oct 23, 2007 · b2dac07 · b2dac07
1 parent ee7b675
commit b2dac07
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 44 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4d022adab4511892226f1eae00a44502bf685ae5
+refs/heads/master: 703530238b580d69d4a112d3ab3d58c0eb1e7246
diff --git a/trunk/include/asm-x86/mmu.h b/trunk/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 */
diff --git a/trunk/include/asm-x86/mmu_32.h b/trunk/include/asm-x86/mmu_32.h
diff --git a/trunk/include/asm-x86/mmu_64.h b/trunk/include/asm-x86/mmu_64.h