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/um/os-Linux/Makefile | |
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/um/os-Linux/Makefile')
-rw-r--r-- | arch/um/os-Linux/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile index 015d00057663..dd764101e488 100644 --- a/arch/um/os-Linux/Makefile +++ b/arch/um/os-Linux/Makefile | |||
@@ -5,13 +5,13 @@ | |||
5 | 5 | ||
6 | obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \ | 6 | obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \ |
7 | registers.o sigio.o signal.o start_up.o time.o tty.o \ | 7 | registers.o sigio.o signal.o start_up.o time.o tty.o \ |
8 | umid.o tls.o user_syms.o util.o drivers/ skas/ | 8 | umid.o user_syms.o util.o drivers/ skas/ |
9 | 9 | ||
10 | obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o | 10 | obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o |
11 | 11 | ||
12 | USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \ | 12 | USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \ |
13 | main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \ | 13 | main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \ |
14 | tty.o tls.o umid.o util.o | 14 | tty.o umid.o util.o |
15 | 15 | ||
16 | CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) | 16 | CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH) |
17 | 17 | ||