X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Fasm-x86%2Fmmu.h;h=efa962c388975c916e3dec785e4b09669e764d42;hb=9135f1901ee6449dfe338adf6e40e9c2025b8150;hp=9c628cd70e23b850fd8c2666a2199b469e4eed96;hpb=6abd2c860e34add677de50e8b134f5af6f4b0893;p=powerpc.git

diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
index 9c628cd70e..efa962c388 100644
--- a/include/asm-x86/mmu.h
+++ b/include/asm-x86/mmu.h
@@ -1,5 +1,31 @@
-#ifdef CONFIG_X86_32
-# include "mmu_32.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;
+
+#ifdef CONFIG_SMP
+void leave_mm(int cpu);
 #else
-# include "mmu_64.h"
+static inline void leave_mm(int cpu)
+{
+}
 #endif
+
+#endif /* _ASM_X86_MMU_H */