From: simonmar <unknown>
Date: Mon, 13 Mar 2000 09:57:16 +0000 (+0000)
Subject: [project @ 2000-03-13 09:57:16 by simonmar]
X-Git-Tag: Approximately_9120_patches~5014
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=c5508be61494a32be0a78051041f53766c58cfc5;p=ghc-hetmet.git

[project @ 2000-03-13 09:57:16 by simonmar]
Remove duplicate definition of unblockOne.
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index 09a2eca..fa7ce41 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -1,5 +1,5 @@
 /* ---------------------------------------------------------------------------
- * $Id: Schedule.c,v 1.49 2000/03/13 09:56:31 simonmar Exp $
+ * $Id: Schedule.c,v 1.50 2000/03/13 09:57:16 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -1845,16 +1845,7 @@ unblockOneLocked(StgTSO *tso)
 }
 #endif
 
-#if defined(GRAN)
-inline StgTSO *
-unblockOne(StgTSO *tso, StgClosure *node)
-{
-  ACQUIRE_LOCK(&sched_mutex);
-  tso = unblockOneLocked(tso, node);
-  RELEASE_LOCK(&sched_mutex);
-  return tso;
-}
-#elif defined(PAR)
+#if defined(PAR) || defined(GRAN)
 inline StgTSO *
 unblockOne(StgTSO *tso, StgClosure *node)
 {