--- old/src/share/vm/runtime/globals.hpp	2016-10-25 10:40:09.793777935 +0200
+++ new/src/share/vm/runtime/globals.hpp	2016-10-25 10:40:09.736777897 +0200
@@ -3959,7 +3959,44 @@
                                                                             \
   product_pd(bool, PreserveFramePointer,                                    \
              "Use the FP register for holding the frame pointer "           \
-             "and not as a general purpose register.")
+             "and not as a general purpose register.")                      \
+                                                                            \
+  product(bool, EnableEventTracing, false,                                  \
+          "Enable event tracing")                                           \
+                                                                            \
+  product(bool, EnableEventTracingParkEvents, true,                         \
+          "Enable tracing of park events")                                  \
+                                                                            \
+  product(bool, EnableEventTracingDiagnostics, false,                       \
+          "Enable extra diagnostic counters and timers for event tracing")  \
+                                                                            \
+  product(ccstr, EventTracingConfiguration, NULL,                           \
+          "Configuration string for event tracing")                         \
+                                                                            \
+  product(bool, EnableEventTracingBufferReuse, false,                       \
+          "Recycle allocated event tracing buffers")                        \
+                                                                            \
+  product(uintx, EventTracingPreallocatedBuffers, 0,                        \
+          "Number of preallocated event tracing buffers")                   \
+                                                                            \
+  product(uintx, EventTracingBufferCapacity, 16384,                         \
+          "Capacity (in bytes) of event tracing buffers")                   \
+                                                                            \
+  product(bool, EnableEventTracingRandomizedBufferCapacity, true,           \
+          "Enable randomization of event tracing buffer sizes (+/- 50%)")   \
+                                                                            \
+  product(uintx, EventTracingStackDepthLimit, 128,                          \
+          "Maximum number of raw (no inlining) stack frames to walk")       \
+                                                                            \
+  product(intx, EventTracingStackMementoFrame, 1,                           \
+          "Patched raw frame to detect stack changes (top = 0, off = -1)")  \
+                                                                            \
+  product(bool, EnableEventTracingStackTraces, true,                        \
+          "Enable stack traces for trace events")                           \
+                                                                            \
+  product(bool, EventTracingStrictMonitorEventOrder, false,                 \
+          "Ensure order of monitor events at the cost of extra events")
+
 
 /*
  *  Macros for factoring of globals