1
1

atomic/mxm: rename symbol that is a duplicate of one in atomic/ucx

This fixes an error when building with --enable-static.

Signed-off-by: Nathan Hjelm <hjelmn@lanl.gov>
Этот коммит содержится в:
Nathan Hjelm 2016-05-25 15:34:40 -06:00
родитель 8e1d59aea8
Коммит dbfab94ede
4 изменённых файлов: 7 добавлений и 7 удалений

Просмотреть файл

@ -29,7 +29,7 @@ OSHMEM_MODULE_DECLSPEC extern mca_atomic_base_component_1_0_0_t
mca_atomic_mxm_component;
/* this component works with spml:ikrit only */
extern mca_spml_ikrit_t *mca_spml_self;
extern mca_spml_ikrit_t *mca_atomic_mxm_spml_self;
OSHMEM_DECLSPEC void atomic_mxm_lock(int pe);
OSHMEM_DECLSPEC void atomic_mxm_unlock(int pe);

Просмотреть файл

@ -30,7 +30,7 @@ const char *mca_atomic_mxm_component_version_string =
/*
* Global variable
*/
mca_spml_ikrit_t *mca_spml_self = NULL;
mca_spml_ikrit_t *mca_atomic_mxm_spml_self = NULL;
/*
* Local function
@ -96,7 +96,7 @@ static int _mxm_open(void)
"Can not use atomic/mxm because spml ikrit component disabled");
return OSHMEM_ERR_NOT_AVAILABLE;
}
mca_spml_self = (mca_spml_ikrit_t *)mca_spml.self;
mca_atomic_mxm_spml_self = (mca_spml_ikrit_t *) mca_spml.self;
return OSHMEM_SUCCESS;
}

Просмотреть файл

@ -74,8 +74,8 @@ int mca_atomic_mxm_cswap(void *target,
/* mxm request init */
sreq.base.state = MXM_REQ_NEW;
sreq.base.mq = mca_spml_self->mxm_mq;
sreq.base.conn = mca_spml_self->mxm_peers[pe]->mxm_hw_rdma_conn;
sreq.base.mq = mca_atomic_mxm_spml_self->mxm_mq;
sreq.base.conn = mca_atomic_mxm_spml_self->mxm_peers[pe]->mxm_hw_rdma_conn;
sreq.base.completed_cb = NULL;
sreq.base.data_type = MXM_REQ_DATA_BUFFER;

Просмотреть файл

@ -76,8 +76,8 @@ int mca_atomic_mxm_fadd(void *target,
/* mxm request init */
sreq.base.state = MXM_REQ_NEW;
sreq.base.mq = mca_spml_self->mxm_mq;
sreq.base.conn = mca_spml_self->mxm_peers[pe]->mxm_hw_rdma_conn;
sreq.base.mq = mca_atomic_mxm_spml_self->mxm_mq;
sreq.base.conn = mca_atomic_mxm_spml_self->mxm_peers[pe]->mxm_hw_rdma_conn;
sreq.base.completed_cb = NULL;
sreq.base.data_type = MXM_REQ_DATA_BUFFER;