From 6cdfefad8742fe0d77789d610b571bdb0c38e428 Mon Sep 17 00:00:00 2001
From: Josh Hursey <jjhursey@open-mpi.org>
Date: Thu, 14 Jun 2007 18:49:41 +0000
Subject: [PATCH] Fix portals BTL and cnos RML.

Both were failing due to interface changes that were never
applied to them properly.

This commit was SVN r15082.
---
 ompi/mca/btl/portals/btl_portals.c |  2 +-
 orte/mca/rml/cnos/rml_cnos.c       | 13 ++++++++++++-
 orte/mca/rml/cnos/rml_cnos.h       |  4 ++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/ompi/mca/btl/portals/btl_portals.c b/ompi/mca/btl/portals/btl_portals.c
index fe3a360e12..03e4a0abf0 100644
--- a/ompi/mca/btl/portals/btl_portals.c
+++ b/ompi/mca/btl/portals/btl_portals.c
@@ -320,7 +320,7 @@ mca_btl_portals_prepare_src(struct mca_btl_base_module_t* btl_base,
 
     if (0 != reserve || 0 != ompi_convertor_need_buffers(convertor)) {
         frag = (mca_btl_portals_frag_t*) 
-            mca_btl_portals_alloc(btl_base, max_data + reserve);
+            mca_btl_portals_alloc(btl_base, MCA_BTL_NO_ORDER, max_data + reserve);
         if (NULL == frag)  {
             return NULL;
         }
diff --git a/orte/mca/rml/cnos/rml_cnos.c b/orte/mca/rml/cnos/rml_cnos.c
index a8a1c20de8..a2500db350 100644
--- a/orte/mca/rml/cnos/rml_cnos.c
+++ b/orte/mca/rml/cnos/rml_cnos.c
@@ -71,10 +71,12 @@ orte_rml_module_t orte_rml_cnos_module = {
     orte_rml_cnos_recv_buffer,
     orte_rml_cnos_recv_buffer_nb,
     orte_rml_cnos_recv_cancel,
-    orte_rml_cnos_barrier,
     orte_rml_cnos_xcast,
     orte_rml_cnos_xcast_nb,
     orte_rml_cnos_xcast_gate,
+    orte_rml_cnos_add_exception_handler,
+    orte_rml_cnos_del_exception_handler,
+    NULL, /* No FT Event function */
     orte_rml_cnos_register_contact_info,
     orte_rml_cnos_register_subscription,
     orte_rml_cnos_get_contact_info,
@@ -283,3 +285,12 @@ void orte_rml_cnos_update_contact_info(orte_gpr_notify_data_t* data,
     return;
 }
 
+int orte_rml_cnos_add_exception_handler(orte_rml_exception_callback_t cbfunc)
+{
+    return ORTE_SUCCESS;
+}
+
+int orte_rml_cnos_del_exception_handler(orte_rml_exception_callback_t cbfunc)
+{
+    return ORTE_SUCCESS;
+}
diff --git a/orte/mca/rml/cnos/rml_cnos.h b/orte/mca/rml/cnos/rml_cnos.h
index de413348ad..da9babb28e 100644
--- a/orte/mca/rml/cnos/rml_cnos.h
+++ b/orte/mca/rml/cnos/rml_cnos.h
@@ -111,6 +111,10 @@ extern "C"
   void orte_rml_cnos_update_contact_info(orte_gpr_notify_data_t* data,
                                          void* cbdata);
 
+  int orte_rml_cnos_add_exception_handler(orte_rml_exception_callback_t cbfunc);
+
+  int orte_rml_cnos_del_exception_handler(orte_rml_exception_callback_t cbfunc);
+
 #if defined(c_plusplus) || defined(__cplusplus)
 }
 #endif