diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:10:49 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:21 -0400 |
| commit | b3ee571e58120de30c3d15657022bf2c72477e02 (patch) | |
| tree | 502d0b09799fb32d4ebd39abda15c48e697367d0 /arch/um/include/shared | |
| parent | f67aa2ffb7ce2f6d88e2e7a8069309dc2627932e (diff) | |
um: take ldt.h to arch/x86/um/asm/mm_context.h
it's x86-only and we have no business playing with it in asm/mmu.h; make
the latter have
struct uml_arch_mm_context arch;
instead of
struct uml_ldt ldt;
and let arch/<subarch>/um/asm/mm_context.h decide what'll be in there.
While we are at it, kill host_ldt.h - it's not needed in part of places
that include it (we want asm/ldt.h in those) and it can be trivially
expanded into the single remaining one.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/include/shared')
| -rw-r--r-- | arch/um/include/shared/ldt.h | 37 |
1 files changed, 0 insertions, 37 deletions
diff --git a/arch/um/include/shared/ldt.h b/arch/um/include/shared/ldt.h deleted file mode 100644 index a7f999a58774..000000000000 --- a/arch/um/include/shared/ldt.h +++ /dev/null | |||
| @@ -1,37 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Copyright (C) 2004 Fujitsu Siemens Computers GmbH | ||
| 3 | * Licensed under the GPL | ||
| 4 | * | ||
| 5 | * Author: Bodo Stroesser <bstroesser@fujitsu-siemens.com> | ||
| 6 | */ | ||
| 7 | |||
| 8 | #ifndef __ASM_LDT_H | ||
| 9 | #define __ASM_LDT_H | ||
| 10 | |||
| 11 | #include <linux/mutex.h> | ||
| 12 | #include <sysdep/host_ldt.h> | ||
| 13 | |||
| 14 | extern void ldt_host_info(void); | ||
| 15 | |||
| 16 | #define LDT_PAGES_MAX \ | ||
| 17 | ((LDT_ENTRIES * LDT_ENTRY_SIZE)/PAGE_SIZE) | ||
| 18 | #define LDT_ENTRIES_PER_PAGE \ | ||
| 19 | (PAGE_SIZE/LDT_ENTRY_SIZE) | ||
| 20 | #define LDT_DIRECT_ENTRIES \ | ||
| 21 | ((LDT_PAGES_MAX*sizeof(void *))/LDT_ENTRY_SIZE) | ||
| 22 | |||
| 23 | struct ldt_entry { | ||
| 24 | __u32 a; | ||
| 25 | __u32 b; | ||
| 26 | }; | ||
| 27 | |||
| 28 | typedef struct uml_ldt { | ||
| 29 | int entry_count; | ||
| 30 | struct mutex lock; | ||
| 31 | union { | ||
| 32 | struct ldt_entry * pages[LDT_PAGES_MAX]; | ||
| 33 | struct ldt_entry entries[LDT_DIRECT_ENTRIES]; | ||
| 34 | } u; | ||
| 35 | } uml_ldt_t; | ||
| 36 | |||
| 37 | #endif | ||
