From 95a3b4a423f36f3381e69db6fa7acc08ec942d73 Mon Sep 17 00:00:00 2001 From: Terry Dontje Date: Tue, 3 Jul 2012 18:52:18 +0000 Subject: [PATCH] corrected the change of pval to lval introduced in r26626 This commit was SVN r26732. The following SVN revision numbers were found above: r26626 --> open-mpi/ompi@249066e06de42ff0df0111e93828d9147c1ed410 --- ompi/mca/btl/openib/btl_openib.c | 4 ++-- ompi/mca/btl/smcuda/btl_smcuda.c | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/ompi/mca/btl/openib/btl_openib.c b/ompi/mca/btl/openib/btl_openib.c index d096a69e14..27d53b636a 100644 --- a/ompi/mca/btl/openib/btl_openib.c +++ b/ompi/mca/btl/openib/btl_openib.c @@ -1648,7 +1648,7 @@ int mca_btl_openib_put( mca_btl_base_module_t* btl, frag->sr_desc.wr.rdma.remote_addr = rem_addr; frag->sr_desc.wr.rdma.rkey = rkey; - to_com_frag(frag)->sg_entry.addr = src_seg->base.seg_addr.lval; + to_com_frag(frag)->sg_entry.addr = src_seg->base.seg_addr.pval; to_com_frag(frag)->sg_entry.length = src_seg->base.seg_len; to_com_frag(frag)->endpoint = ep; #if HAVE_XRC @@ -1730,7 +1730,7 @@ int mca_btl_openib_get(mca_btl_base_module_t* btl, frag->sr_desc.wr.rdma.remote_addr = rem_addr; frag->sr_desc.wr.rdma.rkey = rkey; - to_com_frag(frag)->sg_entry.addr = dst_seg->base.seg_addr.lval; + to_com_frag(frag)->sg_entry.addr = dst_seg->base.seg_addr.pval; to_com_frag(frag)->sg_entry.length = dst_seg->base.seg_len; to_com_frag(frag)->endpoint = ep; diff --git a/ompi/mca/btl/smcuda/btl_smcuda.c b/ompi/mca/btl/smcuda/btl_smcuda.c index 210c9ccbe6..cc9de6091f 100644 --- a/ompi/mca/btl/smcuda/btl_smcuda.c +++ b/ompi/mca/btl/smcuda/btl_smcuda.c @@ -14,6 +14,7 @@ * Copyright (c) 2010-2012 Los Alamos National Security, LLC. * All rights reserved. * Copyright (c) 2012 NVIDIA Corporation. All rights reserved. + * Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved. * $COPYRIGHT$ * * Additional copyrights may follow @@ -715,7 +716,7 @@ struct mca_btl_base_descriptor_t* mca_btl_smcuda_prepare_src( } iov.iov_len = max_data; iov.iov_base = - (IOVBASE_TYPE*)(frag->segment.base.seg_addr.lval + reserve); + (IOVBASE_TYPE*)(frag->segment.base.seg_addr.pval + reserve); rc = opal_convertor_pack(convertor, &iov, &iov_count, &max_data ); if( OPAL_UNLIKELY(rc < 0) ) {