1
1

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@249066e06d
Этот коммит содержится в:
Terry Dontje 2012-07-03 18:52:18 +00:00
родитель 1895ca2bc4
Коммит 95a3b4a423
2 изменённых файлов: 4 добавлений и 3 удалений

Просмотреть файл

@ -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.remote_addr = rem_addr;
frag->sr_desc.wr.rdma.rkey = rkey; 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)->sg_entry.length = src_seg->base.seg_len;
to_com_frag(frag)->endpoint = ep; to_com_frag(frag)->endpoint = ep;
#if HAVE_XRC #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.remote_addr = rem_addr;
frag->sr_desc.wr.rdma.rkey = rkey; 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)->sg_entry.length = dst_seg->base.seg_len;
to_com_frag(frag)->endpoint = ep; to_com_frag(frag)->endpoint = ep;

Просмотреть файл

@ -14,6 +14,7 @@
* Copyright (c) 2010-2012 Los Alamos National Security, LLC. * Copyright (c) 2010-2012 Los Alamos National Security, LLC.
* All rights reserved. * All rights reserved.
* Copyright (c) 2012 NVIDIA Corporation. All rights reserved. * Copyright (c) 2012 NVIDIA Corporation. All rights reserved.
* Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * 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_len = max_data;
iov.iov_base = 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 ); rc = opal_convertor_pack(convertor, &iov, &iov_count, &max_data );
if( OPAL_UNLIKELY(rc < 0) ) { if( OPAL_UNLIKELY(rc < 0) ) {