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/elf_aux.c | |
| parent | 2a6d0ac182688d4d23357ece744978706c044aad (diff) | |
| download | kernel-common-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.tar.gz kernel-common-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.tar.bz2 kernel-common-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/elf_aux.c')
| -rw-r--r-- | arch/um/os-Linux/elf_aux.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c index 608784d4ec57..953323799381 100644 --- a/arch/um/os-Linux/elf_aux.c +++ b/arch/um/os-Linux/elf_aux.c @@ -14,16 +14,11 @@ #include "mem_user.h" #include <kern_constants.h> -/* Use the one from the kernel - the host may miss it, if having old headers. */ -#if UM_ELF_CLASS == UM_ELFCLASS32 typedef Elf32_auxv_t elf_auxv_t; -#else -typedef Elf64_auxv_t elf_auxv_t; -#endif /* These are initialized very early in boot and never changed */ char * elf_aux_platform; -long elf_aux_hwcap; +extern long elf_aux_hwcap; unsigned long vsyscall_ehdr; unsigned long vsyscall_end; unsigned long __kernel_vsyscall; |