Mercurial > hg > graal-compiler
diff src/share/vm/gc_implementation/g1/g1MarkSweep.cpp @ 11173:6b0fd0964b87
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 31 Jul 2013 11:00:54 +0200 |
| parents | 71180a6e5080 |
| children | d55c004e1d4d |
line wrap: on
line diff
--- a/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Tue Jul 30 13:03:28 2013 -0700 +++ b/src/share/vm/gc_implementation/g1/g1MarkSweep.cpp Wed Jul 31 11:00:54 2013 +0200 @@ -43,7 +43,6 @@ #include "oops/instanceRefKlass.hpp" #include "oops/oop.inline.hpp" #include "prims/jvmtiExport.hpp" -#include "runtime/aprofiler.hpp" #include "runtime/biasedLocking.hpp" #include "runtime/fprofiler.hpp" #include "runtime/synchronizer.hpp"