get the shared memory collectives working again with the new

version of orte.

This commit was SVN r17672.

ompi/mca/coll/sm2/coll_sm2.h

@@ -24,7 +24,7 @@
 
 #include "mpi.h"
 #include "opal/mca/mca.h"
-#include "orte/mca/ns/ns_types.h"
+/*#include "orte/mca/ns/ns_types.h" */
 #include "ompi/mca/coll/coll.h"
 #include "ompi/mca/mpool/mpool.h"
 #include "ompi/mca/common/sm/common_sm_mmap.h"

ompi/mca/coll/sm2/coll_sm2_module.c

@@ -36,7 +36,7 @@
 #include "ompi/mca/coll/base/base.h"
 #include "orte/mca/rml/rml.h"
 #include "orte/util/sys_info.h"
-
+#include "orte/util/proc_info.h"
 
 /*
  * Local functions

orte/mca/rml/rml_types.h

@@ -92,6 +92,9 @@ BEGIN_C_DECLS
 #define ORTE_RML_TAG_DATA_SERVER            26
 #define ORTE_RML_TAG_DATA_CLIENT            27
 
+/* support for shared memory collectives */
+#define OMPI_RML_TAG_COLL_SM2_BACK_FILE_CREATED 40
+
 #define ORTE_RML_TAG_MAX                   100