1.1 --- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Tue Nov 27 10:13:20 2012 +0100 1.2 +++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp Tue Nov 27 14:20:21 2012 +0100 1.3 @@ -27,19 +27,7 @@ 1.4 #include "gc_implementation/g1/heapRegion.hpp" 1.5 #include "gc_implementation/g1/satbQueue.hpp" 1.6 #include "runtime/mutexLocker.hpp" 1.7 -#include "runtime/thread.hpp" 1.8 -#ifdef TARGET_OS_FAMILY_linux 1.9 -# include "thread_linux.inline.hpp" 1.10 -#endif 1.11 -#ifdef TARGET_OS_FAMILY_solaris 1.12 -# include "thread_solaris.inline.hpp" 1.13 -#endif 1.14 -#ifdef TARGET_OS_FAMILY_windows 1.15 -# include "thread_windows.inline.hpp" 1.16 -#endif 1.17 -#ifdef TARGET_OS_FAMILY_bsd 1.18 -# include "thread_bsd.inline.hpp" 1.19 -#endif 1.20 +#include "runtime/thread.inline.hpp" 1.21 1.22 G1SATBCardTableModRefBS::G1SATBCardTableModRefBS(MemRegion whole_heap, 1.23 int max_covered_regions) :