Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70353023 authored by Chris Snook's avatar Chris Snook Committed by Thomas Gleixner
Browse files

x86: merge mmu{,_32,_64}.h 



Merge mmu_32.h and mmu_64.h into mmu.h.

Signed-off-by: default avatarChris Snook <csnook@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 4d022ada

include/asm-x86/mmu.h

+22 −4
Original line number Diff line number Diff line 
#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 */

include/asm-x86/mmu_32.h

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
#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

include/asm-x86/mmu_64.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
#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