diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 23:03:09 +0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 17:14:50 +0400 |
| commit | 858ba94499b4f48e9eb0be7cf0092f1ea9460fef (patch) | |
| tree | 8f7a2ba4dc97d771de8b710822dfd2579693220d /arch/um/sys-i386/shared/sysdep/tls.h | |
| parent | 27f85f12639fe821375a69900d96e0fbcc1450bf (diff) | |
| download | linux-858ba94499b4f48e9eb0be7cf0092f1ea9460fef.tar.xz | |
um: merge arch/um/sys-{i386,x86_64}/shared
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um/sys-i386/shared/sysdep/tls.h')
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/tls.h | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/arch/um/sys-i386/shared/sysdep/tls.h b/arch/um/sys-i386/shared/sysdep/tls.h deleted file mode 100644 index 34550755b2a1..000000000000 --- a/arch/um/sys-i386/shared/sysdep/tls.h +++ /dev/null @@ -1,32 +0,0 @@ -#ifndef _SYSDEP_TLS_H -#define _SYSDEP_TLS_H - -# ifndef __KERNEL__ - -/* Change name to avoid conflicts with the original one from <asm/ldt.h>, which - * may be named user_desc (but in 2.4 and in header matching its API was named - * modify_ldt_ldt_s). */ - -typedef struct um_dup_user_desc { - unsigned int entry_number; - unsigned int base_addr; - unsigned int limit; - unsigned int seg_32bit:1; - unsigned int contents:2; - unsigned int read_exec_only:1; - unsigned int limit_in_pages:1; - unsigned int seg_not_present:1; - unsigned int useable:1; -} user_desc_t; - -# else /* __KERNEL__ */ - -# include <ldt.h> -typedef struct user_desc user_desc_t; - -# endif /* __KERNEL__ */ - -#define GDT_ENTRY_TLS_MIN_I386 6 -#define GDT_ENTRY_TLS_MIN_X86_64 12 - -#endif /* _SYSDEP_TLS_H */ |