Fix some error messages.

This commit was SVN r32458.

opal/mca/btl/smcuda/btl_smcuda_component.c

@@ -551,7 +551,7 @@ create_rndv_file(mca_btl_smcuda_component_t *comp_ptr,
      * sizeof(opal_shmem_ds_t), so we know where the mpool_res_size starts. */
     if (-1 == (fd = open(fname, O_CREAT | O_RDWR, 0600))) {
         int err = errno;
-        opal_show_help("help-mpi-btl-sm.txt", "sys call fail", true,
+        opal_show_help("help-mpi-btl-smcuda.txt", "sys call fail", true,
                        "open(2)", strerror(err), err);
         rc = OPAL_ERR_IN_ERRNO;
         goto out;
@@ -559,7 +559,7 @@ create_rndv_file(mca_btl_smcuda_component_t *comp_ptr,
     if ((ssize_t)sizeof(opal_shmem_ds_t) != write(fd, &(tmp_modp->shmem_ds),
                                                   sizeof(opal_shmem_ds_t))) {
         int err = errno;
-        opal_show_help("help-mpi-btl-sm.txt", "sys call fail", true,
+        opal_show_help("help-mpi-btl-smcuda.txt", "sys call fail", true,
                        "write(2)", strerror(err), err);
         rc = OPAL_ERR_IN_ERRNO;
         goto out;
@@ -567,7 +567,7 @@ create_rndv_file(mca_btl_smcuda_component_t *comp_ptr,
     if (MCA_BTL_SM_RNDV_MOD_MPOOL == type) {
         if ((ssize_t)sizeof(size) != write(fd, &size, sizeof(size))) {
             int err = errno;
-            opal_show_help("help-mpi-btl-sm.txt", "sys call fail", true,
+            opal_show_help("help-mpi-btl-smcuda.txt", "sys call fail", true,
                            "write(2)", strerror(err), err);
             rc = OPAL_ERR_IN_ERRNO;
             goto out;
@@ -855,7 +855,7 @@ mca_btl_smcuda_component_init(int *num_btls,
      * to provide that for us. */
     if (UINT32_MAX ==
         (my_local_rank = opal_process_info.my_local_rank)) {
-        opal_show_help("help-mpi-btl-sm.txt", "no locality", true);
+        opal_show_help("help-mpi-btl-smcuda.txt", "no locality", true);
         return NULL;
     }
     /* no use trying to use sm with less than two procs, so just bail. */

opal/mca/btl/smcuda/help-mpi-btl-smcuda.txt

@@ -4,17 +4,24 @@
 #                         of Tennessee Research Foundation.  All rights
 #                         reserved.
 # Copyright (c) 2006-2010 Cisco Systems, Inc.  All rights reserved.
-# Copyright (c) 2012      NVIDIA Corporation.  All rights reserved.
+# Copyright (c) 2012-2014 NVIDIA Corporation.  All rights reserved.
 # $COPYRIGHT$
 # 
 # Additional copyrights may follow
 # 
 # $HEADER$
 #
-# This is the US/English help file for Open MPI's shared memory support.
+# This is the US/English help file for Open MPI's smcuda BTL.
 #
-[CUDA RDMA requested but not supported]
-WARNING: CUDA RDMA support was requested for the shared memory
-(sm) BTL, but it is not supported.  Continuing without it.
+[sys call fail]
+A system call failed during sm BTL initialization that should
+not have.  It is likely that your MPI job will now either abort or
+experience performance degradation.
 
-  Local host: %s
+  System call: %s
+  Error:       %s (errno %d)
+#
+[no locality]
+WARNING: Missing locality information required for smcuda initialization.
+Continuing without smcuda BTL.
+#