Merge pull request #8042 from bosilca/fix/sm_emu

bosilca · web-flow · commit eca00a7a3b17 · 2020-09-14T11:43:00.000-04:00
Fix a copy/paste in the RDMA emulation.
diff --git a/opal/mca/btl/sm/btl_sm_sc_emu.c b/opal/mca/btl/sm/btl_sm_sc_emu.c
@@ -90,7 +90,7 @@ static void mca_btl_sm_sc_emu_atomic_32 (int32_t *operand, opal_atomic_int32_t *
 }
 #endif
 
-static void mca_btl_sm_sc_emu_rdma (mca_btl_base_module_t *btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t *desc, void *ctx)
+static void mca_btl_sm_sc_emu_rdma (mca_btl_base_module_t *btl, const mca_btl_base_receive_descriptor_t *desc)
 {
     mca_btl_sm_sc_emu_hdr_t *hdr = (mca_btl_sm_sc_emu_hdr_t *) desc->des_segments[0].seg_addr.pval;
     size_t size = desc->des_segments[0].seg_len - sizeof (*hdr);

Original file line number	Diff line number	Diff line change
`@@ -90,7 +90,7 @@ static void mca_btl_sm_sc_emu_atomic_32 (int32_t operand, opal_atomic_int32_t `
`90`	`90`	`}`
`91`	`91`	`#endif`
`92`	`92`
`93`		`-static void mca_btl_sm_sc_emu_rdma (mca_btl_base_module_t btl, mca_btl_base_tag_t tag, mca_btl_base_descriptor_t desc, void *ctx)`
	`93`	`+static void mca_btl_sm_sc_emu_rdma (mca_btl_base_module_t btl, const mca_btl_base_receive_descriptor_t desc)`
`94`	`94`	`{`
`95`	`95`	`mca_btl_sm_sc_emu_hdr_t hdr = (mca_btl_sm_sc_emu_hdr_t ) desc->des_segments[0].seg_addr.pval;`
`96`	`96`	`size_t size = desc->des_segments[0].seg_len - sizeof (*hdr);`