Merge pull request open-mpi#780 from matcabral/psm2_symbol_rename_2.x

Updated psm2 mtl with new externally exposed symbols of psm2.so

Author: hppritcha

config/ompi_check_psm2.m4

@@ -48,7 +48,7 @@ AC_DEFUN([OMPI_CHECK_PSM2],[
            OPAL_CHECK_PACKAGE([$1],
                               [psm2.h],
                               [psm2],
-                              [psm_mq_irecv2],
+                              [psm2_mq_irecv2],
 			      [],
                               [$ompi_check_psm2_dir],
                               [$ompi_check_psm2_libdir],

ompi/mca/mtl/psm2/Makefile.am

@@ -22,7 +22,7 @@ EXTRA_DIST = post_configure.sh
 
 AM_CPPFLAGS = $(mtl_psm2_CPPFLAGS)
 
-dist_ompidata_DATA = help-mtl-psm.txt
+dist_ompidata_DATA = help-mtl-psm2.txt
 
 mtl_psm2_sources = \
 	       mtl_psm2.c \

ompi/mca/mtl/psm2/help-mtl-psm.txt renamed to ompi/mca/mtl/psm2/help-mtl-psm2.txt

@@ -1,24 +1,25 @@
 # -*- text -*-
 #
 # Copyright (C) 2009. QLogic Corporation.  All rights reserved.
+# Copyright (c) 2013-2015 Intel, Inc. All rights reserved.
 # $COPYRIGHT$
 #
 # Additional copyrights may follow
 #
 # $HEADER$
 #
-[psm init]
-Initialization of PSM library failed.
+[psm2 init]
+Initialization of PSM2 library failed.
 
   Error: %s
 #
 [debug level]
-Unable to set PSM debug level.
+Unable to set PSM2 debug level.
 
   Error: %s
 #
 [unable to open endpoint]
-PSM was unable to open an endpoint. Please make sure that the network link is
+PSM2 was unable to open an endpoint. Please make sure that the network link is
 active on the node and the hardware is functioning.
 
   Error: %s
@@ -30,10 +31,10 @@ the environment).
   Local host: %s
 #
 [error polling network]
-Error %s occurred in attempting to make network progress (psm_mq_ipeek).
+Error %s occurred in attempting to make network progress (psm2_mq_ipeek).
 #
 [error posting receive]
-Unable to post application receive buffer (psm_mq_irecv or psm_mq_imrecv).
+Unable to post application receive buffer (psm2_mq_irecv or psm2_mq_imrecv).
 
   Error:      %s
   Buffer:     %p