Merge pull request #1503 from jsquyres/pr/remove-verbs-usage-in-usnic-btl

2 usnic fixes

opal/mca/btl/usnic/btl_usnic_hwloc.c

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013-2015 Cisco Systems, Inc.  All rights reserved.
+ * Copyright (c) 2013-2016 Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -9,14 +9,7 @@
 
 #include "opal_config.h"
 
-/* Define this before including hwloc.h so that we also get the hwloc
-   verbs helper header file, too.  We have to do this level of
-   indirection because the hwloc subsystem is a component -- we don't
-   know its exact path.  We have to rely on the framework header files
-   to find the right hwloc verbs helper file for us. */
-#define OPAL_HWLOC_WANT_VERBS_HELPER 1
 #include "opal/mca/hwloc/hwloc.h"
-
 #include "opal/constants.h"
 
 #if BTL_IN_OPAL

opal/mca/btl/usnic/btl_usnic_module.c

@@ -2061,6 +2061,7 @@ static int init_mpool(opal_btl_usnic_module_t *module)
     mpool_resources.register_mem = usnic_reg_mr;
     mpool_resources.deregister_mem = usnic_dereg_mr;
 #if RCACHE_VERSION == 30
+    mpool_resources.cache_name = mca_btl_usnic_component.usnic_rcache_name;
     module->rcache =
         mca_rcache_base_module_create (mca_btl_usnic_component.usnic_rcache_name,
                                        &module->super, &mpool_resources);