diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | malloc/arena.c | 8 |
2 files changed, 9 insertions, 5 deletions
@@ -1,3 +1,9 @@ +2015-08-24 Siddhesh Poyarekar <siddhesh@redhat.com> + + * malloc/arena.c (arena_get2): Drop unused argument. + (arena_lock): Adjust. + (arena_get_retry): Likewise. + 2015-08-24 Andreas Schwab <schwab@suse.de> * sysdeps/unix/sysv/linux/kernel-features.h (__ASSUME_IPC64): diff --git a/malloc/arena.c b/malloc/arena.c index 21ecc5a1..cfec94d 100644 --- a/malloc/arena.c +++ b/malloc/arena.c @@ -102,7 +102,7 @@ int __malloc_initialized = -1; if (ptr && !arena_is_corrupt (ptr)) \ (void) mutex_lock (&ptr->mutex); \ else \ - ptr = arena_get2 (ptr, (size), NULL); \ + ptr = arena_get2 ((size), NULL); \ } while (0) /* find the heap and corresponding arena for a given ptr */ @@ -849,7 +849,7 @@ out: static mstate internal_function -arena_get2 (mstate a_tsd, size_t size, mstate avoid_arena) +arena_get2 (size_t size, mstate avoid_arena) { mstate a; @@ -914,10 +914,8 @@ arena_get_retry (mstate ar_ptr, size_t bytes) } else { - /* Grab ar_ptr->next prior to releasing its lock. */ - mstate prev = ar_ptr->next ? ar_ptr : 0; (void) mutex_unlock (&ar_ptr->mutex); - ar_ptr = arena_get2 (prev, bytes, ar_ptr); + ar_ptr = arena_get2 (bytes, ar_ptr); } return ar_ptr; |