diff options
author | Richard Weinberger <richard@nod.at> | 2011-07-25 17:12:52 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-07-25 20:57:13 -0700 |
commit | b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7 (patch) | |
tree | a9dced710d289d1594ec2a27ca2a88cef5186ac1 /arch/um/os-Linux/Makefile | |
parent | 2a6d0ac182688d4d23357ece744978706c044aad (diff) | |
download | talos-op-linux-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.tar.gz talos-op-linux-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.zip |
um: disable scan_elf_aux() on x86_64
Reusing the host's vDSO makes only sense on x86_32.
Signed-off-by: Richard Weinberger <richard@nod.at>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/um/os-Linux/Makefile')
-rw-r--r-- | arch/um/os-Linux/Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile index d66f0388f091..b33f4dfe7ae5 100644 --- a/arch/um/os-Linux/Makefile +++ b/arch/um/os-Linux/Makefile @@ -3,10 +3,12 @@ # Licensed under the GPL # -obj-y = aio.o elf_aux.o execvp.o file.o helper.o irq.o main.o mem.o process.o \ +obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \ registers.o sigio.o signal.o start_up.o time.o tty.o uaccess.o \ umid.o tls.o user_syms.o util.o drivers/ sys-$(SUBARCH)/ skas/ +obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o + USER_OBJS := $(user-objs-y) aio.o elf_aux.o execvp.o file.o helper.o irq.o \ main.o mem.o process.o registers.o sigio.o signal.o start_up.o time.o \ tty.o tls.o uaccess.o umid.o util.o |