--- a/src/hotspot/share/gc/shared/gc_globals.hpp	Thu Oct 10 17:36:38 2019 +0300
+++ b/src/hotspot/share/gc/shared/gc_globals.hpp	Mon Nov 25 08:11:24 2019 +0100
@@ -210,10 +210,6 @@
           "Number of threads concurrent gc will use")                       \
           constraint(ConcGCThreadsConstraintFunc,AfterErgo)                 \
                                                                             \
-  product(uint, GCTaskTimeStampEntries, 200,                                \
-          "Number of time stamp entries per gc worker thread")              \
-          range(1, max_jint)                                                \
-                                                                            \
   product(bool, AlwaysTenure, false,                                        \
           "Always tenure objects in eden (ParallelGC only)")                \
                                                                             \

--- a/src/hotspot/share/runtime/arguments.cpp	Thu Oct 10 17:36:38 2019 +0300
+++ b/src/hotspot/share/runtime/arguments.cpp	Mon Nov 25 08:11:24 2019 +0100
@@ -622,6 +622,7 @@
   { "GCLockerInvokesConcurrent",     JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(15) },
   { "BindGCTaskThreadsToCPUs",       JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
   { "UseGCTaskAffinity",             JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
+  { "GCTaskTimeStampEntries",        JDK_Version::undefined(), JDK_Version::jdk(14), JDK_Version::jdk(16) },
 
 #ifdef TEST_VERIFY_SPECIAL_JVM_FLAGS
   // These entries will generate build errors.  Their purpose is to test the macros.

--- a/test/hotspot/gtest/runtime/test_globals.cpp	Thu Oct 10 17:36:38 2019 +0300
+++ b/test/hotspot/gtest/runtime/test_globals.cpp	Mon Nov 25 08:11:24 2019 +0100
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016, 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2016, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -54,10 +54,6 @@
   TEST_FLAG(ConcGCThreads, uint, 1337);
 }
 
-TEST_VM(FlagGuard, uintx_flag) {
-  TEST_FLAG(GCTaskTimeStampEntries, uint, 1337);
-}
-
 TEST_VM(FlagGuard, size_t_flag) {
   TEST_FLAG(HeapSizePerGCThread, size_t, 1337);
 }

--- a/test/hotspot/jtreg/gc/parallel/TestPrintGCDetailsVerbose.java	Thu Oct 10 17:36:38 2019 +0300
+++ b/test/hotspot/jtreg/gc/parallel/TestPrintGCDetailsVerbose.java	Mon Nov 25 08:11:24 2019 +0100
@@ -31,7 +31,6 @@
  * @requires vm.gc.Parallel
  * @modules java.base/jdk.internal.misc
  * @run main/othervm -Xmx50m -XX:+UseParallelGC -Xlog:gc*=trace gc.parallel.TestPrintGCDetailsVerbose
- * @run main/othervm -Xmx50m -XX:+UseParallelGC -XX:GCTaskTimeStampEntries=1 -Xlog:gc*=trace gc.parallel.TestPrintGCDetailsVerbose
  */
 public class TestPrintGCDetailsVerbose {