Mercurial > jdk8-mips64-public > hotspot / file diff

     1.1 --- a/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Fri Jul 10 16:01:20 2009 -0700
     1.2 +++ b/src/share/vm/gc_implementation/g1/g1CollectorPolicy.cpp	Tue Jul 14 15:40:39 2009 -0700
     1.3 @@ -293,10 +293,6 @@
     1.4    if (G1SteadyStateUsed < 50) {
     1.5      vm_exit_during_initialization("G1SteadyStateUsed must be at least 50%.");
     1.6    }
     1.7 -  if (UseConcMarkSweepGC) {
     1.8 -    vm_exit_during_initialization("-XX:+UseG1GC is incompatible with "
     1.9 -                                  "-XX:+UseConcMarkSweepGC.");
    1.10 -  }
    1.11  
    1.12    initialize_gc_policy_counters();
    1.13