From 76f5991ab2dd03e50639f2e481b8e7efd95e74d0 Mon Sep 17 00:00:00 2001 From: Ralph Castain Date: Thu, 8 May 2014 02:26:45 +0000 Subject: [PATCH] Couple of minor fixes This commit was SVN r31680. --- ompi/mca/btl/openib/btl_openib_component.c | 4 ++-- ompi/mca/btl/openib/btl_openib_mca.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ompi/mca/btl/openib/btl_openib_component.c b/ompi/mca/btl/openib/btl_openib_component.c index 350e34ddc7..6c159f186c 100644 --- a/ompi/mca/btl/openib/btl_openib_component.c +++ b/ompi/mca/btl/openib/btl_openib_component.c @@ -1977,7 +1977,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev) mca_btl_openib_component.receive_queues)) { opal_show_help("help-mpi-btl-openib.txt", "locally conflicting receive_queues", true, - opal_install_dirs.ompidatadir, + opal_install_dirs.opaldatadir, ompi_process_info.nodename, ibv_get_device_name(receive_queues_device->ib_dev), receive_queues_device->ib_dev_attr.vendor_id, @@ -2001,7 +2001,7 @@ static int init_one_device(opal_list_t *btl_list, struct ibv_device* ib_dev) mca_btl_openib_component.receive_queues_source) { opal_show_help("help-mpi-btl-openib.txt", "locally conflicting receive_queues", true, - opal_install_dirs.ompidatadir, + opal_install_dirs.opaldatadir, ompi_process_info.nodename, ibv_get_device_name(receive_queues_device->ib_dev), receive_queues_device->ib_dev_attr.vendor_id, diff --git a/ompi/mca/btl/openib/btl_openib_mca.c b/ompi/mca/btl/openib/btl_openib_mca.c index 9f858e37e9..509090bba7 100644 --- a/ompi/mca/btl/openib/btl_openib_mca.c +++ b/ompi/mca/btl/openib/btl_openib_mca.c @@ -270,7 +270,7 @@ int btl_openib_register_mca_params(void) OMPI_HAVE_IBV_FORK_INIT ? -1 : 0, &mca_btl_openib_component.want_fork_support, 0)); asprintf(&str, "%s/mca-btl-openib-device-params.ini", - opal_install_dirs.ompidatadir); + opal_install_dirs.opaldatadir); if (NULL == str) { return OMPI_ERR_OUT_OF_RESOURCE; }