Merge branch 'charm' of charmgit:charm into charm
authorYanhua Sun <sun51@illinois.edu>
Fri, 29 Jul 2011 04:16:19 +0000 (00:16 -0400)
committerYanhua Sun <sun51@illinois.edu>
Fri, 29 Jul 2011 04:16:19 +0000 (00:16 -0400)
src/arch/gemini_gni/Makefile.machine
src/arch/gemini_gni/machine.c

index f832fa593d0460350c6c6aaf7a9427bb7ce438b7..5b1a9995b5b0dc32143d5bf157295586ac6472b4 100644 (file)
@@ -1,2 +1,2 @@
-$(L)/libconv-cplus-n.a: machine.c machine-common.c
+$(L)/libconv-cplus-n.a: machine.c machine-common.c machine-lrts.h
 
index 4c54b7fe64ed8677d6b83337d36e2df0413cd6f4..474babaea3776f3766c1996b71e9086eb8e040e6 100644 (file)
@@ -462,7 +462,7 @@ static void PumpMsgs()
 
         if(pd.type == GNI_POST_RDMA_PUT) 
             status = GNI_PostRdma(ep_hndl_array[request_msg->source], &pd);
-        lse
+        else
             status = GNI_PostFma(ep_hndl_array[request_msg->source], &pd);
 
         if(status = GNI_RC_SUCCESS)