*** old/src/share/vm/memory/cardTableModRefBS.cpp	Wed Jan 15 01:41:49 2014
--- new/src/share/vm/memory/cardTableModRefBS.cpp	Wed Jan 15 01:41:49 2014

*** 96,106 ****
--- 96,106 ----
    if (!heap_rs.is_reserved()) {
      vm_exit_during_initialization("Could not reserve enough space for the "
                                    "card marking array");
    }
  
!   // The assember store_check code will do an unsigned shift of the oop,
!   // The assembler store_check code will do an unsigned shift of the oop,
    // then add it to byte_map_base, i.e.
    //
    //   _byte_map = byte_map_base + (uintptr_t(low_bound) >> card_shift)
    _byte_map = (jbyte*) heap_rs.base();
    byte_map_base = _byte_map - (uintptr_t(low_bound) >> card_shift);

*** 241,251 ****
--- 241,251 ----
    MemRegion const old_region = _covered[ind];
    assert(old_region.start() == new_region.start(), "just checking");
    if (new_region.word_size() != old_region.word_size()) {
      // Commit new or uncommit old pages, if necessary.
      MemRegion cur_committed = _committed[ind];
!     // Extend the end of this _commited region
!     // Extend the end of this _committed region
      // to cover the end of any lower _committed regions.
      // This forms overlapping regions, but never interior regions.
      HeapWord* const max_prev_end = largest_prev_committed_end(ind);
      if (max_prev_end > cur_committed.end()) {
        cur_committed.set_end(max_prev_end);

*** 446,456 ****
--- 446,456 ----
      // setting n_par_threads to 0, then n_par_threads should be
      // equal to active_workers.  When a different mechanism for shutting
      // off parallelism is used, then active_workers can be used in
      // place of n_par_threads.
      //  This is an example of a path where n_par_threads is
!     // set to 0 to turn off parallism.
!     // set to 0 to turn off parallelism.
      //  [7] CardTableModRefBS::non_clean_card_iterate()
      //  [8] CardTableRS::younger_refs_in_space_iterate()
      //  [9] Generation::younger_refs_in_space_iterate()
      //  [10] OneContigSpaceCardGeneration::younger_refs_iterate()
      //  [11] CompactingPermGenGen::younger_refs_iterate()