merge conflicts

[simgrid.git] / src / xbt / mmalloc / mfree.c

diff --git a/src/xbt/mmalloc/mfree.c b/src/xbt/mmalloc/mfree.c
index aae9149..e9e7210 100644 (file)
--- a/src/xbt/mmalloc/mfree.c
+++ b/src/xbt/mmalloc/mfree.c
@@ -179,7 +179,6 @@ void mfree(void *md, void *ptr)
 
   if (ptr != NULL) {
     mdp = MD_TO_MDP(md);
-    LOCK(mdp);
     for (l = mdp->aligned_blocks; l != NULL; l = l->next) {
       if (l->aligned == ptr) {
         l->aligned = NULL;      /* Mark the slot in the list as free. */
@@ -188,10 +187,9 @@ void mfree(void *md, void *ptr)
       }
     }
     if (mdp->mfree_hook != NULL) {
-      (*mdp->mfree_hook) (mdp, ptr);
+      mdp->mfree_hook(mdp, ptr);
     } else {
       __mmalloc_free(mdp, ptr);
     }
-    UNLOCK(mdp);
   }
 }