From 86f8c66a271fba372fc0d07730859af02fa464bb Mon Sep 17 00:00:00 2001
From: Jeff Squyres <jsquyres@cisco.com>
Date: Tue, 30 Jan 2007 15:39:49 +0000
Subject: [PATCH] Turns out that the leave_pinned stuff isn't used in these
 BTLs at all.  So just remove it.

This commit was SVN r13360.
---
 ompi/mca/btl/gm/btl_gm.h                 | 3 +--
 ompi/mca/btl/gm/btl_gm_component.c       | 3 ---
 ompi/mca/btl/udapl/btl_udapl.h           | 2 +-
 ompi/mca/btl/udapl/btl_udapl_component.c | 2 --
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/ompi/mca/btl/gm/btl_gm.h b/ompi/mca/btl/gm/btl_gm.h
index 8e73b48082..ef26e14d7d 100644
--- a/ompi/mca/btl/gm/btl_gm.h
+++ b/ompi/mca/btl/gm/btl_gm.h
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2004-2005 The Trustees of Indiana University and Indiana
  *                         University Research and Technology
@@ -10,6 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -71,7 +71,6 @@ struct mca_btl_gm_component_t {
     opal_list_t gm_procs;   /**< list of gm proc structures */
     opal_mutex_t gm_lock;   /**< lock for accessing module state */
     char* gm_mpool_name;    /**< name of memory pool */ 
-    bool leave_pinned;      /**< pin memory on first use and leave pinned */
 }; 
 typedef struct mca_btl_gm_component_t mca_btl_gm_component_t;
 
diff --git a/ompi/mca/btl/gm/btl_gm_component.c b/ompi/mca/btl/gm/btl_gm_component.c
index 6366082b5d..cd0ace0c81 100644
--- a/ompi/mca/btl/gm/btl_gm_component.c
+++ b/ompi/mca/btl/gm/btl_gm_component.c
@@ -27,7 +27,6 @@
 #include "ompi/mca/pml/pml.h"
 #include "ompi/mca/btl/btl.h"
 #include "ompi/request/request.h"
-#include "ompi/runtime/params.h"
 
 #include "opal/mca/base/mca_base_param.h"
 #include "orte/mca/errmgr/errmgr.h"
@@ -186,8 +185,6 @@ int mca_btl_gm_component_open(void)
         gm_max_length_for_size(mca_btl_gm_component.gm_max_frag_size) -
         sizeof(mca_btl_base_header_t);
 
-    /* leave pinned option */
-    mca_btl_gm_component.leave_pinned = (int) ompi_mpi_leave_pinned;
     return OMPI_SUCCESS;
 }
 
diff --git a/ompi/mca/btl/udapl/btl_udapl.h b/ompi/mca/btl/udapl/btl_udapl.h
index fc98306cac..ef61fca8b2 100644
--- a/ompi/mca/btl/udapl/btl_udapl.h
+++ b/ompi/mca/btl/udapl/btl_udapl.h
@@ -10,6 +10,7 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2006      Sun Microsystems, Inc.  All rights reserved.
+ * Copyright (c) 2007      Cisco Systems, Inc.  All rights reserved.
  *
  * $COPYRIGHT$
  * 
@@ -99,7 +100,6 @@ struct mca_btl_udapl_component_t {
     opal_list_t udapl_procs;   /**< list of udapl proc structures */
     opal_mutex_t udapl_lock;   /**< lock for accessing module state */
     char* udapl_mpool_name;    /**< name of memory pool */ 
-    bool leave_pinned;      /**< pin memory on first use and leave pinned */
 }; 
 typedef struct mca_btl_udapl_component_t mca_btl_udapl_component_t;
 
diff --git a/ompi/mca/btl/udapl/btl_udapl_component.c b/ompi/mca/btl/udapl/btl_udapl_component.c
index d11e816e84..31853669e4 100644
--- a/ompi/mca/btl/udapl/btl_udapl_component.c
+++ b/ompi/mca/btl/udapl/btl_udapl_component.c
@@ -219,8 +219,6 @@ int mca_btl_udapl_component_open(void)
         sizeof(mca_btl_udapl_frag_eager_rdma_t) +
         mca_btl_udapl_component.udapl_eager_frag_size;
 
-    /* leave pinned option */
-    mca_btl_udapl_component.leave_pinned = (int) ompi_mpi_leave_pinned;
     return OMPI_SUCCESS;
 }