am d377833d: am 6bf42ddc: Merge "Fix private/bionic_name_mem.h build breakage."

* commit 'd377833de61664b57f656aa0111b7a4b166b1df8':
  Fix private/bionic_name_mem.h build breakage.
This commit is contained in:
Elliott Hughes 2014-07-17 22:20:56 +00:00 committed by Android Git Automerger
commit bb74030901

View File

@ -16,7 +16,6 @@
#include "dlmalloc.h" #include "dlmalloc.h"
#include "private/bionic_name_mem.h"
#include "private/libc_logging.h" #include "private/libc_logging.h"
// Send dlmalloc errors to the log. // Send dlmalloc errors to the log.
@ -56,6 +55,6 @@ static void* named_anonymous_mmap(size_t length) {
if (map == MAP_FAILED) { if (map == MAP_FAILED) {
return map; return map;
} }
prctl(BIONIC_PR_SET_VMA, BIONIC_PR_SET_VMA_ANON_NAME, map, length, "libc_malloc"); prctl(PR_SET_VMA, PR_SET_VMA_ANON_NAME, map, length, "libc_malloc");
return map; return map;
} }