diff -r 6ffb8d7fe1e4 -r a421bdf22394 src/hotspot/share/gc/shared/satbMarkQueue.hpp
--- a/src/hotspot/share/gc/shared/satbMarkQueue.hpp	Tue Mar 05 14:07:30 2019 -0800
+++ b/src/hotspot/share/gc/shared/satbMarkQueue.hpp	Tue Mar 05 19:54:33 2019 -0500
@@ -28,7 +28,7 @@
 #include "gc/shared/ptrQueue.hpp"
 #include "memory/allocation.hpp"
 
-class JavaThread;
+class Thread;
 class Monitor;
 class SATBMarkQueueSet;
 
@@ -92,7 +92,6 @@
 };
 
 class SATBMarkQueueSet: public PtrQueueSet {
-  SATBMarkQueue _shared_satb_queue;
   size_t _buffer_enqueue_threshold;
 
 #ifdef ASSERT
@@ -112,11 +111,10 @@
   void initialize(Monitor* cbl_mon,
                   BufferNode::Allocator* allocator,
                   size_t process_completed_buffers_threshold,
-                  uint buffer_enqueue_threshold_percentage,
-                  Mutex* lock);
+                  uint buffer_enqueue_threshold_percentage);
 
 public:
-  virtual SATBMarkQueue& satb_queue_for_thread(JavaThread* const t) const = 0;
+  virtual SATBMarkQueue& satb_queue_for_thread(Thread* const t) const = 0;
 
   // Apply "set_active(active)" to all SATB queues in the set. It should be
   // called only with the world stopped. The method will assert that the
@@ -141,8 +139,6 @@
   void print_all(const char* msg);
 #endif // PRODUCT
 
-  SATBMarkQueue* shared_satb_queue() { return &_shared_satb_queue; }
-
   // If a marking is being abandoned, reset any unprocessed log buffers.
   void abandon_partial_marking();
 };