Commit 4dc706c2 authored by Al Viro's avatar Al Viro Committed by Richard Weinberger
Browse files

um: take um_mmu.h to asm/mmu.h, clean asm/mmu_context.h a bit 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
Signed-off-by: default avatarRichard Weinberger <richard@nod.at>
parent 548fd1e8

arch/um/include/asm/mmu.h

+17 −5
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2002 Jeff Dike (jdike@karaya.com)

 * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */



#ifndef __MMU_H

#define __MMU_H

#ifndef __ARCH_UM_MMU_H

#define __ARCH_UM_MMU_H



#include "um_mmu.h"

#include "mm_id.h"

#include "ldt.h"



#endif

typedef struct mm_context {

	struct mm_id id;

	struct uml_ldt ldt;

	struct page **stub_pages;

} mm_context_t;



extern void __switch_mm(struct mm_id * mm_idp);



/* Avoid tangled inclusion with asm/ldt.h */

extern long init_new_ldt(struct mm_context *to_mm, struct mm_context *from_mm);

extern void free_ldt(struct mm_context *mm);



#endif

arch/um/include/asm/mmu_context.h

+2 −5
Original line number Diff line number Diff line
@@ -6,15 +6,12 @@ 
#ifndef __UM_MMU_CONTEXT_H

#define __UM_MMU_CONTEXT_H



#include "linux/sched.h"

#include "um_mmu.h"

#include <linux/sched.h>

#include <asm/mmu.h>



extern void arch_dup_mmap(struct mm_struct *oldmm, struct mm_struct *mm);

extern void arch_exit_mmap(struct mm_struct *mm);



#define get_mmu_context(task) do ; while(0)

#define activate_context(tsk) do ; while(0)



#define deactivate_mm(tsk,mm)	do { } while (0)



extern void force_flush_all(void);

arch/um/include/shared/um_mmu.h

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
/* 

 * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)

 * Licensed under the GPL

 */



#ifndef __ARCH_UM_MMU_H

#define __ARCH_UM_MMU_H



#include "mm_id.h"

#include "ldt.h"



typedef struct mm_context {

	struct mm_id id;

	struct uml_ldt ldt;

	struct page **stub_pages;

} mm_context_t;



extern void __switch_mm(struct mm_id * mm_idp);



/* Avoid tangled inclusion with asm/ldt.h */

extern long init_new_ldt(struct mm_context *to_mm, struct mm_context *from_mm);

extern void free_ldt(struct mm_context *mm);



#endif