summary refs log tree commit diff
path: root/ChangeLog
diff options
context:
space:
mode:
authorTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-03-11 16:57:38 -0300
committerTulio Magno Quites Machado Filho <tuliom@linux.vnet.ibm.com>2016-03-11 18:09:40 -0300
commitb43f552a8a23c0e405ab13a268bee12ada3b7841 (patch)
tree948bd07081ed168302938e475159bb9b0c5c4f81 /ChangeLog
parent869d7180dd4a462674971a25b66070da7f2eabcf (diff)
downloadglibc-b43f552a8a23c0e405ab13a268bee12ada3b7841.tar.gz
glibc-b43f552a8a23c0e405ab13a268bee12ada3b7841.tar.xz
glibc-b43f552a8a23c0e405ab13a268bee12ada3b7841.zip
Fix type of parameter passed by malloc_consolidate
atomic_exchange_acq() expected a pointer, but was receiving an integer.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 440b0212d2..99fe2c9ac8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-03-11  Tulio Magno Quites Machado Filho  <tuliom@linux.vnet.ibm.com>
+
+	* malloc/malloc.c (malloc_consolidate): Replace 0 by NULL in
+	order to match the type of p when calling atomic_exchange_acq().
+
 2016-03-11  Rajalakshmi Srinivasaraghavan  <raji@linux.vnet.ibm.com>
 
 	* sysdeps/powerpc/powerpc32/power4/memcmp.S (memcmp): Rearrange