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/main.c | |
| parent | 2a6d0ac182688d4d23357ece744978706c044aad (diff) | |
| download | kernel_goldelico_gta04-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.zip kernel_goldelico_gta04-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.tar.gz kernel_goldelico_gta04-b743ac54e54ca18fb7164a97cc77cf1ccee0b0f7.tar.bz2 | |
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/main.c')
| -rw-r--r-- | arch/um/os-Linux/main.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/um/os-Linux/main.c b/arch/um/os-Linux/main.c index fb2a97a..8471b81 100644 --- a/arch/um/os-Linux/main.c +++ b/arch/um/os-Linux/main.c @@ -21,6 +21,8 @@ #define STACKSIZE (8 * 1024 * 1024) #define THREAD_NAME_LEN (256) +long elf_aux_hwcap; + static void set_stklim(void) { struct rlimit lim; @@ -143,7 +145,9 @@ int __init main(int argc, char **argv, char **envp) install_fatal_handler(SIGINT); install_fatal_handler(SIGTERM); +#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA scan_elf_aux(envp); +#endif do_uml_initcalls(); ret = linux_main(argc, argv); |