--- a/hotspot/src/share/vm/memory/universe.cpp	Wed Sep 03 14:43:49 2014 +0200
+++ b/hotspot/src/share/vm/memory/universe.cpp	Wed Sep 03 19:13:18 2014 -0400
@@ -1256,8 +1256,8 @@
     // 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