X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fruntime%2Fstorage%2FSMmarking.lc;h=72972227bd918fc404e7038e4c9eee941cf459f8;hp=d1eb76e4c8adb4654cc408b63022afc24a00727b;hb=5eb1c77c795f92ed0f4c8023847e9d4be1a4fd0d;hpb=f7ecf7234c224489be8a5e63fced903b655d92ee

diff --git a/ghc/runtime/storage/SMmarking.lc b/ghc/runtime/storage/SMmarking.lc
index d1eb76e..7297222 100644
--- a/ghc/runtime/storage/SMmarking.lc
+++ b/ghc/runtime/storage/SMmarking.lc
@@ -47,12 +47,10 @@ EXTDATA(_PRMarking_MarkNextClosureInFetchBuffer_closure);
 EXTFUN(_PRMarking_MarkNextGA);
 EXTDATA(_PRMarking_MarkNextGA_closure);
 #else
-# if 1 /* !defined(GRAN) */ /* HWL */
 EXTFUN(_PRMarking_MarkNextAStack);
 EXTFUN(_PRMarking_MarkNextBStack);
 EXTDATA(_PRMarking_MarkNextAStack_closure);
 EXTDATA(_PRMarking_MarkNextBStack_closure);
-# endif
 #endif /* not parallel */
 
 P_ sm_roots_end;
@@ -157,7 +155,6 @@ markHeapRoots(sm, cafs1, cafs2, base, lim, bit_array)
     } while (!found && MRoot != NULL);
 
     DEBUG_STRING("Marking Sparks (GRAN):");
-    /* ToDo: Check this code */
     for(proc = 0; proc < RTSflags.GranFlags.proc; ++proc) {
       for(pool = 0; pool < SPARK_POOLS; pool++) {
 	 MRoot = (P_) PendingSparksHd[proc][pool];
@@ -195,7 +192,6 @@ markHeapRoots(sm, cafs1, cafs2, base, lim, bit_array)
 	miniInterpret((StgFunPtr) _startMarkWorld);
     }
 #else
-# if 1  /* !defined(GRAN) */  /* HWL */
     /* Note: no *external* stacks in parallel/concurrent world */
 
     DEBUG_STRING("Marking A Stack:");
@@ -214,7 +210,6 @@ markHeapRoots(sm, cafs1, cafs2, base, lim, bit_array)
 	MStack = (P_) _PRMarking_MarkNextBStack_closure;
 	miniInterpret((StgFunPtr)_startMarkWorld);
     }
-# endif /* ! CONCURRENT */
 #endif /* PAR */
 
     DEBUG_STRING("Marking & Updating CAFs:");