dect
/
linux-2.6
Archived
13
0
Fork 0
Code Releases Activity

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>
This commit is contained in:
Chris Snook 2007-10-20 02:56:59 -04:00 committed by Thomas Gleixner
parent 4d022adab4
commit 703530238b
3 changed files with 22 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
include/asm-x86/mmu.h
View File

@ -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 */

18
include/asm-x86/mmu_32.h
View File

@ -1,18 +0,0 @@
#ifndef __i386_MMU_H
#define __i386_MMU_H
#include <linux/mutex.h>
/*
* The i386 doesn't have a mmu context, but
* we put the segment information here.
*
* cpu_vm_mask is used to optimize ldt flushing.
*/
typedef struct {
int size;
struct mutex lock;
void *ldt;
void *vdso;
} mm_context_t;
#endif

21
include/asm-x86/mmu_64.h
View File

@ -1,21 +0,0 @@
#ifndef __x86_64_MMU_H
#define __x86_64_MMU_H
#include <linux/spinlock.h>
#include <linux/mutex.h>
/*
* The x86_64 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;
rwlock_t ldtlock;
int size;
struct mutex lock;
void *vdso;
} mm_context_t;
#endif