--- a/hotspot/src/share/vm/runtime/thread.cpp	Tue May 10 14:26:31 2016 +0000
+++ b/hotspot/src/share/vm/runtime/thread.cpp	Tue May 10 12:10:21 2016 -0500
@@ -60,6 +60,7 @@
 #include "runtime/atomic.inline.hpp"
 #include "runtime/biasedLocking.hpp"
 #include "runtime/commandLineFlagConstraintList.hpp"
+#include "runtime/commandLineFlagWriteableList.hpp"
 #include "runtime/commandLineFlagRangeList.hpp"
 #include "runtime/deoptimization.hpp"
 #include "runtime/fprofiler.hpp"
@@ -3544,6 +3545,8 @@
     return JNI_EINVAL;
   }
 
+  CommandLineFlagWriteableList::mark_startup();
+
   if (PauseAtStartup) {
     os::pause();
   }