*** old/src/share/vm/memory/universe.cpp	Fri Aug 22 10:18:42 2014
--- new/src/share/vm/memory/universe.cpp	Fri Aug 22 10:18:39 2014

*** 1254,1265 ****
--- 1254,1265 ----
      DeoptimizationMarker dm;
  
      // Deoptimize all activations depending on marked nmethods
      Deoptimization::deoptimize_dependents();
  
!     // Make the dependent methods not entrant (in VM_Deoptimize they are made zombies)
!     CodeCache::make_marked_nmethods_not_entrant();
!     // Make the dependent methods zombies (like VM_Deoptimize)
!     CodeCache::make_marked_nmethods_zombies();
    }
  }
  #endif // HOTSWAP