# HG changeset patch
# User apetrusenko
# Date 1253878794 25200
# Node ID fa1565f1aa3d65bf659f53543fecc373b515064f
# Parent  67b89f5a5cac0a4c21c3d73ff3fb6116b5819791# Parent  cef24d2f0baf972490a2808f89eeba120ae34b6c
Merge

diff -r 67b89f5a5cac -r fa1565f1aa3d hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp
--- a/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Tue Sep 22 21:12:37 2009 -0600
+++ b/hotspot/src/share/vm/gc_implementation/parallelScavenge/psParallelCompact.cpp	Fri Sep 25 04:39:54 2009 -0700
@@ -2752,7 +2752,6 @@
   cm->revisit_klass_stack()->push(k);
 }
 
-#if ( defined(COMPILER1) || defined(COMPILER2) )
 void PSParallelCompact::revisit_mdo(ParCompactionManager* cm, DataLayout* p) {
   cm->revisit_mdo_stack()->push(p);
 }
@@ -2778,7 +2777,6 @@
     follow_stack(cm);
   }
 }
-#endif //  ( COMPILER1 || COMPILER2 )
 
 
 #ifdef VALIDATE_MARK_SWEEP
diff -r 67b89f5a5cac -r fa1565f1aa3d hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp
--- a/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp	Tue Sep 22 21:12:37 2009 -0600
+++ b/hotspot/src/share/vm/gc_implementation/shared/markSweep.cpp	Fri Sep 25 04:39:54 2009 -0700
@@ -73,7 +73,6 @@
   follow_stack();
 }
 
-#if ( defined(COMPILER1) || defined(COMPILER2) )
 void MarkSweep::revisit_mdo(DataLayout* p) {
   _revisit_mdo_stack->push(p);
 }
@@ -92,7 +91,6 @@
   }
   follow_stack();
 }
-#endif //  ( COMPILER1 || COMPILER2 )
 
 MarkSweep::FollowRootClosure  MarkSweep::follow_root_closure;