src/hotspot/share/gc/g1/g1ConcurrentMark.cpp

rev 57840 : imported patch 8215297-remove-ptt
rev 57842 : [mq]: 8238220-rename-owsttaskterminator

*** 44,57 ****
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/gcVMOperations.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
- #include "gc/shared/owstTaskTerminator.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/strongRootsScope.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #include "include/jvm.h"
  #include "logging/log.hpp"
--- 44,57 ----
  #include "gc/shared/gcId.hpp"
  #include "gc/shared/gcTimer.hpp"
  #include "gc/shared/gcTraceTime.inline.hpp"
  #include "gc/shared/gcVMOperations.hpp"
  #include "gc/shared/genOopClosures.inline.hpp"
  #include "gc/shared/referencePolicy.hpp"
  #include "gc/shared/strongRootsScope.hpp"
  #include "gc/shared/suspendibleThreadSet.hpp"
+ #include "gc/shared/taskTerminator.hpp"
  #include "gc/shared/taskqueue.inline.hpp"
  #include "gc/shared/weakProcessor.inline.hpp"
  #include "gc/shared/workerPolicy.hpp"
  #include "include/jvm.h"
  #include "logging/log.hpp"