From 85b78f838eed47c18b191e92597c6ce7ec31066a Mon Sep 17 00:00:00 2001 From: Nathan Hjelm Date: Thu, 31 Jul 2014 15:29:20 +0000 Subject: [PATCH] Fix mpool/udreg compilation This commit was SVN r32377. --- opal/mca/mpool/udreg/mpool_udreg.h | 5 +++-- opal/mca/mpool/udreg/mpool_udreg_component.c | 2 +- opal/mca/mpool/udreg/mpool_udreg_module.c | 10 +++++----- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/opal/mca/mpool/udreg/mpool_udreg.h b/opal/mca/mpool/udreg/mpool_udreg.h index 5394ac90d3..ee53c16ece 100644 --- a/opal/mca/mpool/udreg/mpool_udreg.h +++ b/opal/mca/mpool/udreg/mpool_udreg.h @@ -28,9 +28,10 @@ #include "opal_config.h" #include "opal/class/opal_list.h" -#include "opal/class/opal_free_list.h" +#include "opal/class/ompi_free_list.h" #include "opal/mca/event/event.h" #include "opal/mca/mpool/mpool.h" +#include "opal/util/proc.h" #if HAVE_SYS_MMAN_H #include #endif @@ -93,7 +94,7 @@ OBJ_CLASS_DECLARATION(mca_mpool_udreg_hugepage_pool_item_t); struct mca_mpool_udreg_module_t { mca_mpool_base_module_t super; struct mca_mpool_base_resources_t resources; - opal_free_list_t reg_list; + ompi_free_list_t reg_list; mca_mpool_udreg_hugepage_t *huge_page; void *udreg_handle; }; diff --git a/opal/mca/mpool/udreg/mpool_udreg_component.c b/opal/mca/mpool/udreg/mpool_udreg_component.c index 7bfabde36d..a7c77a6103 100644 --- a/opal/mca/mpool/udreg/mpool_udreg_component.c +++ b/opal/mca/mpool/udreg/mpool_udreg_component.c @@ -25,7 +25,7 @@ #define OPAL_DISABLE_ENABLE_MEM_DEBUG 1 #include "opal_config.h" #include "opal/mca/base/base.h" -#include "opal/runtime/params.h" +#include "opal/runtime/opal_params.h" #include "mpool_udreg.h" #ifdef HAVE_UNISTD_H #include diff --git a/opal/mca/mpool/udreg/mpool_udreg_module.c b/opal/mca/mpool/udreg/mpool_udreg_module.c index 73e1aabb44..53b473e82e 100644 --- a/opal/mca/mpool/udreg/mpool_udreg_module.c +++ b/opal/mca/mpool/udreg/mpool_udreg_module.c @@ -34,7 +34,7 @@ #include #endif #include "opal/mca/mpool/base/base.h" -#include "opal/runtime/params.h" +#include "opal/runtime/opal_params.h" #include "opal/include/opal_stdint.h" #include @@ -175,8 +175,8 @@ int mca_mpool_udreg_module_init(mca_mpool_udreg_module_t* mpool) return OPAL_ERROR; } - OBJ_CONSTRUCT(&mpool->reg_list, opal_free_list_t); - opal_free_list_init_new(&mpool->reg_list, mpool->resources.sizeof_reg, + OBJ_CONSTRUCT(&mpool->reg_list, ompi_free_list_t); + ompi_free_list_init_new(&mpool->reg_list, mpool->resources.sizeof_reg, opal_cache_line_size, OBJ_CLASS(mca_mpool_base_registration_t), 0, opal_cache_line_size, 0, -1, 32, NULL); @@ -189,7 +189,7 @@ static void *mca_mpool_udreg_reg_func (void *addr, uint64_t len, void *reg_conte { mca_mpool_udreg_module_t *mpool_udreg = (mca_mpool_udreg_module_t *) reg_context; mca_mpool_base_registration_t *udreg_reg; - opal_free_list_item_t *item; + ompi_free_list_item_t *item; int rc; OMPI_FREE_LIST_GET_MT(&mpool_udreg->reg_list, item); @@ -222,7 +222,7 @@ static uint32_t mca_mpool_udreg_dereg_func (void *device_data, void *dreg_contex if (OPAL_LIKELY(OPAL_SUCCESS == rc)) { OMPI_FREE_LIST_RETURN_MT(&mpool_udreg->reg_list, - (opal_free_list_item_t *) udreg_reg); + (ompi_free_list_item_t *) udreg_reg); } /* might be worth printing out a warning if an error occurs here */