src/share/vm/gc/cms/parCardTableModRefBS.cpp

*** 21,34 ****
   * questions.
   *
   */
  
  #include "precompiled.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/collectedHeap.hpp"
- #include "gc/shared/genCollectedHeap.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/virtualspace.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
--- 21,34 ----
   * questions.
   *
   */
  
  #include "precompiled.hpp"
+ #include "gc/cms/cmsHeap.hpp"
  #include "gc/shared/cardTableModRefBS.hpp"
  #include "gc/shared/cardTableRS.hpp"
  #include "gc/shared/collectedHeap.hpp"
  #include "gc/shared/space.inline.hpp"
  #include "memory/allocation.inline.hpp"
  #include "memory/virtualspace.hpp"
  #include "oops/oop.inline.hpp"
  #include "runtime/java.hpp"
*** 392,402 ****
    // freed "_lowest_non_clean" array.)
  
    // Do a dirty read here. If we pass the conditional then take the rare
    // event lock and do the read again in case some other thread had already
    // succeeded and done the resize.
!   int cur_collection = GenCollectedHeap::heap()->total_collections();
    // Updated _last_LNC_resizing_collection[i] must not be visible before
    // _lowest_non_clean and friends are visible. Therefore use acquire/release
    // to guarantee this on non TSO architecures.
    if (OrderAccess::load_acquire(&_last_LNC_resizing_collection[i]) != cur_collection) {
      MutexLocker x(ParGCRareEvent_lock);
--- 392,402 ----
    // freed "_lowest_non_clean" array.)
  
    // Do a dirty read here. If we pass the conditional then take the rare
    // event lock and do the read again in case some other thread had already
    // succeeded and done the resize.
!   int cur_collection = CMSHeap::heap()->total_collections();
    // Updated _last_LNC_resizing_collection[i] must not be visible before
    // _lowest_non_clean and friends are visible. Therefore use acquire/release
    // to guarantee this on non TSO architecures.
    if (OrderAccess::load_acquire(&_last_LNC_resizing_collection[i]) != cur_collection) {
      MutexLocker x(ParGCRareEvent_lock);