--- a/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Wed May 24 17:30:45 2017 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiEnv.cpp	Thu May 25 09:38:33 2017 +0200
@@ -985,8 +985,8 @@
     results[i] = JVMTI_ERROR_NONE;  // indicate successful suspend
   }
   if (needSafepoint > 0) {
-    VM_ForceSafepoint vfs;
-    VMThread::execute(&vfs);
+    VM_ThreadsSuspendJVMTI tsj;
+    VMThread::execute(&tsj);
   }
   // per-thread suspend results returned via results parameter
   return JVMTI_ERROR_NONE;