--- old/src/hotspot/share/runtime/synchronizer.hpp	2019-08-28 15:03:31.470958379 -0400
+++ new/src/hotspot/share/runtime/synchronizer.hpp	2019-08-28 15:03:31.282958385 -0400
@@ -35,7 +35,13 @@
 class ObjectMonitorHandle;
 class ThreadsList;
 
-typedef PaddedEnd<ObjectMonitor, DEFAULT_CACHE_LINE_SIZE> PaddedObjectMonitor;
+#ifndef OM_CACHE_LINE_SIZE
+// Use DEFAULT_CACHE_LINE_SIZE if not already specified for
+// the current build platform.
+#define OM_CACHE_LINE_SIZE DEFAULT_CACHE_LINE_SIZE
+#endif
+
+typedef PaddedEnd<ObjectMonitor, OM_CACHE_LINE_SIZE> PaddedObjectMonitor;
 
 struct DeflateMonitorCounters {
   int n_in_use;              // currently associated with objects
@@ -142,19 +148,21 @@
   // An adaptive profile-based deflation policy could be used if needed
   static void deflate_idle_monitors(DeflateMonitorCounters* counters);
   static void deflate_global_idle_monitors_using_JT();
-  static void deflate_per_thread_idle_monitors_using_JT();
-  static void deflate_common_idle_monitors_using_JT(bool is_global, JavaThread* self);
+  static void deflate_per_thread_idle_monitors_using_JT(JavaThread* target);
+  static void deflate_common_idle_monitors_using_JT(bool is_global, JavaThread* target);
   static void deflate_thread_local_monitors(Thread* thread, DeflateMonitorCounters* counters);
   static void prepare_deflate_idle_monitors(DeflateMonitorCounters* counters);
   static void finish_deflate_idle_monitors(DeflateMonitorCounters* counters);
 
   // For a given monitor list: global or per-thread, deflate idle monitors
   static int deflate_monitor_list(ObjectMonitor** list_p,
+                                  int* count_p,
                                   ObjectMonitor** free_head_p,
                                   ObjectMonitor** free_tail_p);
   // For a given in-use monitor list: global or per-thread, deflate idle
   // monitors using a JavaThread.
   static int deflate_monitor_list_using_JT(ObjectMonitor** list_p,
+                                           int* count_p,
                                            ObjectMonitor** free_head_p,
                                            ObjectMonitor** free_tail_p,
                                            ObjectMonitor** saved_mid_in_use_p);
@@ -203,13 +211,6 @@
   enum { _BLOCKSIZE = 128 };
   // global list of blocks of monitors
   static PaddedObjectMonitor* volatile g_block_list;
-  // global monitor free list
-  static ObjectMonitor* volatile g_free_list;
-  // global monitor in-use list, for moribund threads,
-  // monitors they inflated need to be scanned for deflation
-  static ObjectMonitor* volatile g_om_in_use_list;
-  // count of entries in g_om_in_use_list
-  static int g_om_in_use_count;
   static volatile bool _is_async_deflation_requested;
   static volatile bool _is_special_deflation_requested;
   static jlong         _last_async_deflation_time_ns;