diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | malloc/malloc.c | 3 |
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog index 4f035c460d..12f2687d91 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2015-02-18 Siddhesh Poyarekar <siddhesh@redhat.com> + + * malloc/malloc.c (__libc_malloc): Consolidate arena_lookup and + arena_lock into a single arena_get. + 2015-05-22 Roland McGrath <roland@hack.frob.com> * nptl/nptl-init.c (__pthread_initialize_minimal_internal): diff --git a/malloc/malloc.c b/malloc/malloc.c index aa7edbfd45..d2d80388ca 100644 --- a/malloc/malloc.c +++ b/malloc/malloc.c @@ -2883,9 +2883,8 @@ __libc_malloc (size_t bytes) if (__builtin_expect (hook != NULL, 0)) return (*hook)(bytes, RETURN_ADDRESS (0)); - arena_lookup (ar_ptr); + arena_get (ar_ptr, bytes); - arena_lock (ar_ptr, bytes); if (!ar_ptr) return 0; |