diff -r 682119c4c32e -r c1950f51ed60 src/share/vm/runtime/vm_operations.cpp
--- a/src/share/vm/runtime/vm_operations.cpp	Thu Oct 08 09:37:23 2015 +0200
+++ b/src/share/vm/runtime/vm_operations.cpp	Thu Oct 08 09:37:51 2015 +0200
@@ -106,8 +106,8 @@
   // Deoptimize all activations depending on marked nmethods
   Deoptimization::deoptimize_dependents();
 
-  // Make the dependent methods zombies
-  CodeCache::make_marked_nmethods_zombies();
+  // Make the dependent methods not entrant
+  CodeCache::make_marked_nmethods_not_entrant();
 }