aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/um/shared
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 15:10:49 -0400
committerRichard Weinberger <richard@nod.at>2011-11-02 09:15:21 -0400
commitb3ee571e58120de30c3d15657022bf2c72477e02 (patch)
tree502d0b09799fb32d4ebd39abda15c48e697367d0 /arch/x86/um/shared
parentf67aa2ffb7ce2f6d88e2e7a8069309dc2627932e (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/x86/um/shared')
-rw-r--r--arch/x86/um/shared/sysdep/host_ldt.h37
-rw-r--r--arch/x86/um/shared/sysdep/tls.h1
2 files changed, 0 insertions, 38 deletions
diff --git a/arch/x86/um/shared/sysdep/host_ldt.h b/arch/x86/um/shared/sysdep/host_ldt.h
deleted file mode 100644
index 246ff7ace5e5..000000000000
--- a/arch/x86/um/shared/sysdep/host_ldt.h
+++ /dev/null
@@ -1,37 +0,0 @@
1#ifndef __ASM_HOST_LDT_H
2#define __ASM_HOST_LDT_H
3
4#include <asm/ldt.h>
5
6#define LDT_entry_a(info) \
7 ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff))
8
9#define LDT_entry_b(info) \
10 (((info)->base_addr & 0xff000000) | \
11 (((info)->base_addr & 0x00ff0000) >> 16) | \
12 ((info)->limit & 0xf0000) | \
13 (((info)->read_exec_only ^ 1) << 9) | \
14 ((info)->contents << 10) | \
15 (((info)->seg_not_present ^ 1) << 15) | \
16 ((info)->seg_32bit << 22) | \
17 ((info)->limit_in_pages << 23) | \
18 ((info)->useable << 20) | \
19 0x7000)
20
21#define _LDT_empty(info) (\
22 (info)->base_addr == 0 && \
23 (info)->limit == 0 && \
24 (info)->contents == 0 && \
25 (info)->read_exec_only == 1 && \
26 (info)->seg_32bit == 0 && \
27 (info)->limit_in_pages == 0 && \
28 (info)->seg_not_present == 1 && \
29 (info)->useable == 0 )
30
31#ifdef CONFIG_X86_64
32#define LDT_empty(info) (_LDT_empty(info) && ((info)->lm == 0))
33#else
34#define LDT_empty(info) (_LDT_empty(info))
35#endif
36
37#endif
diff --git a/arch/x86/um/shared/sysdep/tls.h b/arch/x86/um/shared/sysdep/tls.h
index f2f30bd67b9b..27cce00c6b30 100644
--- a/arch/x86/um/shared/sysdep/tls.h
+++ b/arch/x86/um/shared/sysdep/tls.h
@@ -24,7 +24,6 @@ typedef struct um_dup_user_desc {
24 24
25# else /* __KERNEL__ */ 25# else /* __KERNEL__ */
26 26
27# include <ldt.h>
28typedef struct user_desc user_desc_t; 27typedef struct user_desc user_desc_t;
29 28
30# endif /* __KERNEL__ */ 29# endif /* __KERNEL__ */