am 5b673d23: am 4ff967f3: Merge "Fix arm64/x86 build."

* commit '5b673d23688cc78829a510be3b5825757e38be6a':
  Fix arm64/x86 build.
This commit is contained in:
Torne (Richard Coles) 2014-04-22 13:37:43 +00:00 committed by Android Git Automerger
commit 122d756378

View File

@ -1946,7 +1946,7 @@ static void add_vdso(KernelArgumentBlock& args __unused) {
si->flags = 0;
si->load_bias = get_elf_exec_load_bias(ehdr_vdso);
soinfo_link_image(si);
soinfo_link_image(si, NULL);
#endif
}