diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-18 01:26:38 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:21 -0700 |
| commit | efb21cc2384e385c4873ac6e7b23f16659469ea9 (patch) | |
| tree | e7da1bf7e0d02327a974ec5724e9209eeb9ec7ef /arch/um/include/shared/sysdep-i386 | |
| parent | 5077c2a9cd43e8db71f8257e745e1d27e7b79d3f (diff) | |
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 <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/include/shared/sysdep-i386')
| -rw-r--r-- | arch/um/include/shared/sysdep-i386/host_ldt.h | 34 | ||||
| -rw-r--r-- | arch/um/include/shared/sysdep-i386/tls.h | 2 |
2 files changed, 35 insertions, 1 deletions
diff --git a/arch/um/include/shared/sysdep-i386/host_ldt.h b/arch/um/include/shared/sysdep-i386/host_ldt.h new file mode 100644 index 00000000000..0953cc4df65 --- /dev/null +++ b/arch/um/include/shared/sysdep-i386/host_ldt.h @@ -0,0 +1,34 @@ +#ifndef __ASM_HOST_LDT_I386_H +#define __ASM_HOST_LDT_I386_H + +#include <asm/ldt.h> + +/* + * macros stolen from include/asm-i386/desc.h + */ +#define LDT_entry_a(info) \ + ((((info)->base_addr & 0x0000ffff) << 16) | ((info)->limit & 0x0ffff)) + +#define LDT_entry_b(info) \ + (((info)->base_addr & 0xff000000) | \ + (((info)->base_addr & 0x00ff0000) >> 16) | \ + ((info)->limit & 0xf0000) | \ + (((info)->read_exec_only ^ 1) << 9) | \ + ((info)->contents << 10) | \ + (((info)->seg_not_present ^ 1) << 15) | \ + ((info)->seg_32bit << 22) | \ + ((info)->limit_in_pages << 23) | \ + ((info)->useable << 20) | \ + 0x7000) + +#define LDT_empty(info) (\ + (info)->base_addr == 0 && \ + (info)->limit == 0 && \ + (info)->contents == 0 && \ + (info)->read_exec_only == 1 && \ + (info)->seg_32bit == 0 && \ + (info)->limit_in_pages == 0 && \ + (info)->seg_not_present == 1 && \ + (info)->useable == 0 ) + +#endif diff --git a/arch/um/include/shared/sysdep-i386/tls.h b/arch/um/include/shared/sysdep-i386/tls.h index 918fd3c5ff9..34550755b2a 100644 --- a/arch/um/include/shared/sysdep-i386/tls.h +++ b/arch/um/include/shared/sysdep-i386/tls.h @@ -21,7 +21,7 @@ typedef struct um_dup_user_desc { # else /* __KERNEL__ */ -# include <asm/ldt.h> +# include <ldt.h> typedef struct user_desc user_desc_t; # endif /* __KERNEL__ */ |