resolve conflict
authorYanhua Sun <sun51@hopper07.(none)>
Thu, 8 Mar 2012 23:07:18 +0000 (15:07 -0800)
committerYanhua Sun <sun51@hopper07.(none)>
Thu, 8 Mar 2012 23:07:18 +0000 (15:07 -0800)
src/arch/gemini_gni/machine.c

index 6a83c15fdc541a6e1a1c6f839a42210c78862e26..9d368c0bc0595021778073b8f24f0a5403bd1e55 100644 (file)
@@ -1200,7 +1200,6 @@ static gni_return_t send_smsg_message(SMSG_QUEUE *queue, int destNode, void *msg
         }
 #endif
         CMI_GNI_LOCK
-<<<<<<< HEAD
 #if CMK_SMP_TRACE_COMMTHREAD
         int oldpe = -1;
         int oldeventid = -1;
@@ -1215,13 +1214,10 @@ static gni_return_t send_smsg_message(SMSG_QUEUE *queue, int destNode, void *msg
             TRACE_COMM_SET_COMM_MSGID(real_data);
         }
 #endif
-        status = GNI_SmsgSendWTag(ep_hndl_array[destNode], 0, 0, msg, size, 0, tag);
+        status = GNI_SmsgSendWTag(ep_hndl_array[destNode], buf, bufsize, msg, size, 0, tag);
 #if CMK_SMP_TRACE_COMMTHREAD
         if (oldpe != -1)  TRACE_COMM_SET_MSGID(real_data, oldpe, oldeventid);
 #endif
-=======
-        status = GNI_SmsgSendWTag(ep_hndl_array[destNode], buf, bufsize, msg, size, 0, tag);
->>>>>>> 6bc5ef7da3aa42d00053cc7680a14257efe4ee42
         CMI_GNI_UNLOCK
         if(status == GNI_RC_SUCCESS)
         {