diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 15:09:49 -0400 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 09:15:17 -0400 |
| commit | 1bbd5f21f426d99660ea8120b79595a282e5ff8a (patch) | |
| tree | f9980460722d4f89ca468c7af92502daa82d8c1a /arch/x86/um/shared | |
| parent | c5cc32fe14ccbc19484202d20cf7d6bad45e3567 (diff) | |
um: merge os-Linux/tls.c into arch/x86/um/os-Linux/tls.c
it's i386-specific; moreover, analogs on other targets have
incompatible interface - PTRACE_GET_THREAD_AREA does exist
elsewhere, but struct user_desc does *not*
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/tls.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/um/shared/sysdep/tls.h b/arch/x86/um/shared/sysdep/tls.h index db2ae9c12e23..f2f30bd67b9b 100644 --- a/arch/x86/um/shared/sysdep/tls.h +++ b/arch/x86/um/shared/sysdep/tls.h | |||
| @@ -29,6 +29,9 @@ typedef struct user_desc user_desc_t; | |||
| 29 | 29 | ||
| 30 | # endif /* __KERNEL__ */ | 30 | # endif /* __KERNEL__ */ |
| 31 | 31 | ||
| 32 | extern int os_set_thread_area(user_desc_t *info, int pid); | ||
| 33 | extern int os_get_thread_area(user_desc_t *info, int pid); | ||
| 34 | |||
| 32 | #ifdef __i386__ | 35 | #ifdef __i386__ |
| 33 | #define GDT_ENTRY_TLS_MIN_I386 6 | 36 | #define GDT_ENTRY_TLS_MIN_I386 6 |
| 34 | #define GDT_ENTRY_TLS_MIN_X86_64 12 | 37 | #define GDT_ENTRY_TLS_MIN_X86_64 12 |