From 1954bd0b832f0d98c6d32edebb05ae02ca7448e1 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:09:09 +0100 Subject: [PATCH] --- yaml --- r: 273033 b: refs/heads/master c: 4dc706c2f292b2c28016a27f400af84a62ec4a63 h: refs/heads/master i: 273031: afb7c8d5c6ae04eda59fd39fdbb8d67ca0028c53 v: v3 --- [refs] | 2 +- trunk/arch/um/include/asm/mmu.h | 22 +++++++++++++++++----- trunk/arch/um/include/asm/mmu_context.h | 7 ++----- trunk/arch/um/include/shared/um_mmu.h | 24 ------------------------ 4 files changed, 20 insertions(+), 35 deletions(-) delete mode 100644 trunk/arch/um/include/shared/um_mmu.h diff --git a/[refs] b/[refs] index e5a6697152af..5b776d787860 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 548fd1e8dba90bea674f5969d73498959d83924b +refs/heads/master: 4dc706c2f292b2c28016a27f400af84a62ec4a63 diff --git a/trunk/arch/um/include/asm/mmu.h b/trunk/arch/um/include/asm/mmu.h index cf259de51531..b1a7e47d1027 100644 --- a/trunk/arch/um/include/asm/mmu.h +++ b/trunk/arch/um/include/asm/mmu.h @@ -1,12 +1,24 @@ /* - * 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 diff --git a/trunk/arch/um/include/asm/mmu_context.h b/trunk/arch/um/include/asm/mmu_context.h index 34d813011b7a..591b3d8d7614 100644 --- a/trunk/arch/um/include/asm/mmu_context.h +++ b/trunk/arch/um/include/asm/mmu_context.h @@ -6,15 +6,12 @@ #ifndef __UM_MMU_CONTEXT_H #define __UM_MMU_CONTEXT_H -#include "linux/sched.h" -#include "um_mmu.h" +#include +#include 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); diff --git a/trunk/arch/um/include/shared/um_mmu.h b/trunk/arch/um/include/shared/um_mmu.h deleted file mode 100644 index b1a7e47d1027..000000000000 --- a/trunk/arch/um/include/shared/um_mmu.h +++ /dev/null @@ -1,24 +0,0 @@ -/* - * 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