From: sof <unknown>
Date: Thu, 19 Jan 2006 02:15:38 +0000 (+0000)
Subject: [project @ 2006-01-19 02:15:38 by sof]
X-Git-Tag: final_switch_to_darcs,_this_repo_is_now_live~2
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=a106bbffa1188d62bb86e357714bbe4acdecd37e

[project @ 2006-01-19 02:15:38 by sof]
tryPutMVarzh_fast: make it work in the non-full case.

Merge to STABLE.
---

diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm
index ff95943..67d3767 100644
--- a/ghc/rts/PrimOps.cmm
+++ b/ghc/rts/PrimOps.cmm
@@ -1729,7 +1729,6 @@ tryPutMVarzh_fast
 #if defined(SMP)
     	foreign "C" unlockClosure(mvar "ptr", stg_EMPTY_MVAR_info);
 #endif
-	jump %ENTRY_CODE(Sp(0));
     }
     else
     {
@@ -1741,9 +1740,9 @@ tryPutMVarzh_fast
 #else
 	SET_INFO(mvar,stg_FULL_MVAR_info);
 #endif
-	jump %ENTRY_CODE(Sp(0));
     }
     
+    RET_N(1);
     /* ToDo: yield afterward for better communication performance? */
 }