From 78fcbca8cafeacb05517f71f40c82328326e74f9 Mon Sep 17 00:00:00 2001 From: Thomas Naughton Date: Tue, 11 Aug 2020 15:35:32 -0400 Subject: [PATCH] add arg for sicm_arena_create() and fix header - Add arg for newer SICM API in sicm_arena_create() - Fix header path for OMPI master include 'mutex_unix.h' Signed-off-by: Thomas Naughton --- opal/mca/mpool/sicm/mpool_sicm.h | 2 +- opal/mca/mpool/sicm/mpool_sicm_module.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/opal/mca/mpool/sicm/mpool_sicm.h b/opal/mca/mpool/sicm/mpool_sicm.h index fcc80f5fa62..a0ed2e4a6ea 100644 --- a/opal/mca/mpool/sicm/mpool_sicm.h +++ b/opal/mca/mpool/sicm/mpool_sicm.h @@ -14,7 +14,7 @@ #define MCA_MPOOL_SICM_H #include "opal_config.h" -#include "opal/threads/mutex_unix.h" +#include "opal/mca/threads/mutex.h" #include "opal/mca/event/event.h" #include "opal/mca/mpool/mpool.h" diff --git a/opal/mca/mpool/sicm/mpool_sicm_module.c b/opal/mca/mpool/sicm/mpool_sicm_module.c index aa6d8a028e3..4b4c0dada43 100644 --- a/opal/mca/mpool/sicm/mpool_sicm_module.c +++ b/opal/mca/mpool/sicm/mpool_sicm_module.c @@ -76,7 +76,7 @@ mpool_sicm_alloc (mca_mpool_base_module_t *module, size_t size, size_t align, ui if (dev == NULL) return NULL; - arena = sicm_arena_create (0, dev); + arena = sicm_arena_create (0, SICM_ALLOC_RELAXED, dev); if (arena == NULL) return NULL;