lguest: don't set MAC address for guest unless specified

[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..00e88679e11f780af5654ae54f2bfafc7e572369 100644 (file)
--- 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 */