From 8569c9140bd41089f9b6be8837ca421102714a90 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Sun, 17 Aug 2008 13:48:37 -0400 Subject: x86, um: take arch/um/include/* out of the way We can't just plop asm/* into it - userland helpers are built with it in search path and seeing asm/* show up there suddenly would be a bad idea. Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- arch/um/include/shared/um_mmu.h | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 arch/um/include/shared/um_mmu.h (limited to 'arch/um/include/shared/um_mmu.h') diff --git a/arch/um/include/shared/um_mmu.h b/arch/um/include/shared/um_mmu.h new file mode 100644 index 00000000000..f575ff91f2a --- /dev/null +++ b/arch/um/include/shared/um_mmu.h @@ -0,0 +1,25 @@ +/* + * 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 "uml-config.h" +#include "mm_id.h" +#include "asm/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 -- cgit v1.2.3-18-g5258 From efb21cc2384e385c4873ac6e7b23f16659469ea9 Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 18 Aug 2008 01:26:38 -0400 Subject: x86, um: untangle uml ldt.h * turn asm/ldt.h into ldt.h; update the (very few) users * take host_ldt.h into sysdep, kill symlink mess * includes of asm/arch/ldt.h turn into asm/ldt.h now Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- arch/um/include/shared/um_mmu.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/um/include/shared/um_mmu.h') diff --git a/arch/um/include/shared/um_mmu.h b/arch/um/include/shared/um_mmu.h index f575ff91f2a..4cc1ef4d022 100644 --- a/arch/um/include/shared/um_mmu.h +++ b/arch/um/include/shared/um_mmu.h @@ -8,7 +8,7 @@ #include "uml-config.h" #include "mm_id.h" -#include "asm/ldt.h" +#include "ldt.h" typedef struct mm_context { struct mm_id id; -- cgit v1.2.3-18-g5258 From 887c57d480ee9dbfec53f2539359dd289f50acab Mon Sep 17 00:00:00 2001 From: Al Viro Date: Mon, 25 Aug 2008 04:12:10 -0400 Subject: x86, um: get rid of excessive includes of uml-config.h Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- arch/um/include/shared/um_mmu.h | 1 - 1 file changed, 1 deletion(-) (limited to 'arch/um/include/shared/um_mmu.h') diff --git a/arch/um/include/shared/um_mmu.h b/arch/um/include/shared/um_mmu.h index 4cc1ef4d022..b1a7e47d102 100644 --- a/arch/um/include/shared/um_mmu.h +++ b/arch/um/include/shared/um_mmu.h @@ -6,7 +6,6 @@ #ifndef __ARCH_UM_MMU_H #define __ARCH_UM_MMU_H -#include "uml-config.h" #include "mm_id.h" #include "ldt.h" -- cgit v1.2.3-18-g5258