diff options
| author | Chris Snook <csnook@redhat.com> | 2007-10-20 02:56:59 -0400 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2007-10-23 22:37:22 +0200 |
| commit | 703530238b580d69d4a112d3ab3d58c0eb1e7246 (patch) | |
| tree | 92d901481a3fe4549a7cb4dfb4cf2e08bad2780b /include/asm-x86/mmu.h | |
| parent | 4d022adab4511892226f1eae00a44502bf685ae5 (diff) | |
x86: merge mmu{,_32,_64}.h
Merge mmu_32.h and mmu_64.h into mmu.h.
Signed-off-by: Chris Snook <csnook@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86/mmu.h')
| -rw-r--r-- | include/asm-x86/mmu.h | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h index 9c628cd70e2..3f922c8e1c8 100644 --- 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 */ |