*** old/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Tue Dec  9 14:42:28 2014
--- new/src/share/vm/gc_implementation/concurrentMarkSweep/compactibleFreeListSpace.cpp	Tue Dec  9 14:42:24 2014

*** 81,93 ****
--- 81,95 ----
    // free list locks are in the range of values taken by _lockRank
    // This range currently is [_leaf+2, _leaf+3]
    // Note: this requires that CFLspace c'tors
    // are called serially in the order in which the locks are
    // are acquired in the program text. This is true today.
-   _freelistLock(_lockRank--, "CompactibleFreeListSpace._lock", true),
+                 Monitor::_safepoint_check_sometimes),
    _parDictionaryAllocLock(Mutex::leaf - 1,  // == rank(ExpandHeap_lock) - 1
-                           "CompactibleFreeListSpace._dict_par_lock", true),
+                           Monitor::_safepoint_check_never),
    _rescan_task_size(CardTableModRefBS::card_size_in_words * BitsPerWord *
                      CMSRescanMultiple),
    _marking_task_size(CardTableModRefBS::card_size_in_words * BitsPerWord *
                      CMSConcMarkMultiple),
    _collector(NULL)

*** 149,160 ****
--- 151,161 ----
    check_free_list_consistency();
  
    // Initialize locks for parallel case.
    for (size_t i = IndexSetStart; i < IndexSetSize; i += IndexSetStride) {
      _indexedFreeListParLocks[i] = new Mutex(Mutex::leaf - 1, // == ExpandHeap_lock - 1
!                                             "a freelist par lock", true, Mutex::_safepoint_check_sometimes);
                                              true);
      DEBUG_ONLY(
        _indexedFreeList[i].set_protecting_lock(_indexedFreeListParLocks[i]);
      )
    }
    _dictionary->set_par_lock(&_parDictionaryAllocLock);