1.1 --- a/src/share/vm/memory/cardTableRS.cpp Wed Feb 06 15:22:32 2013 -0800
1.2 +++ b/src/share/vm/memory/cardTableRS.cpp Thu Feb 07 16:05:48 2013 -0500
1.3 @@ -31,10 +31,11 @@
1.4 #include "oops/oop.inline.hpp"
1.5 #include "runtime/java.hpp"
1.6 #include "runtime/os.hpp"
1.7 -#ifndef SERIALGC
1.8 +#include "utilities/macros.hpp"
1.9 +#if INCLUDE_ALL_GCS
1.10 #include "gc_implementation/g1/concurrentMark.hpp"
1.11 #include "gc_implementation/g1/g1SATBCardTableModRefBS.hpp"
1.12 -#endif
1.13 +#endif // INCLUDE_ALL_GCS
1.14
1.15 CardTableRS::CardTableRS(MemRegion whole_heap,
1.16 int max_covered_regions) :
1.17 @@ -42,7 +43,7 @@
1.18 _cur_youngergen_card_val(youngergenP1_card),
1.19 _regions_to_iterate(max_covered_regions - 1)
1.20 {
1.21 -#ifndef SERIALGC
1.22 +#if INCLUDE_ALL_GCS
1.23 if (UseG1GC) {
1.24 _ct_bs = new G1SATBCardTableLoggingModRefBS(whole_heap,
1.25 max_covered_regions);
