am c5749f1f: am 061246b6: Merge "Restore dlmalloc mmap threshold to 64k"

* commit 'c5749f1f4232e59e66737488036aba1f583867d5':
  Restore dlmalloc mmap threshold to 64k
This commit is contained in:
Rom Lemarchand 2013-07-23 13:58:12 -07:00 committed by Android Git Automerger
commit c847f749fe

View File

@ -27,6 +27,7 @@
#define LOCK_AT_FORK 1 #define LOCK_AT_FORK 1
#define USE_RECURSIVE_LOCK 0 #define USE_RECURSIVE_LOCK 0
#define USE_SPIN_LOCKS 0 #define USE_SPIN_LOCKS 0
#define DEFAULT_MMAP_THRESHOLD (64U * 1024U)
/* Include the proper definitions. */ /* Include the proper definitions. */
#include "../upstream-dlmalloc/malloc.h" #include "../upstream-dlmalloc/malloc.h"