diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:09:49 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:15:17 +0100 |
| commit | 1bbd5f21f426d99660ea8120b79595a282e5ff8a (patch) | |
| tree | f9980460722d4f89ca468c7af92502daa82d8c1a /arch/um/include | |
| parent | c5cc32fe14ccbc19484202d20cf7d6bad45e3567 (diff) | |
| download | linux-1bbd5f21f426d99660ea8120b79595a282e5ff8a.tar.gz linux-1bbd5f21f426d99660ea8120b79595a282e5ff8a.tar.bz2 linux-1bbd5f21f426d99660ea8120b79595a282e5ff8a.zip | |
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/um/include')
| -rw-r--r-- | arch/um/include/shared/os.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index caa66619a9b4..89b686c1a3ea 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h @@ -10,7 +10,6 @@ #include "irq_user.h" #include "longjmp.h" #include "mm_id.h" -#include "sysdep/tls.h" #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) @@ -212,10 +211,6 @@ extern int run_helper_thread(int (*proc)(void *), void *arg, extern int helper_wait(int pid); -/* tls.c */ -extern int os_set_thread_area(user_desc_t *info, int pid); -extern int os_get_thread_area(user_desc_t *info, int pid); - /* umid.c */ extern int umid_file_name(char *name, char *buf, int len); extern int set_umid(char *name); |