--- a/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp	Tue Mar 05 14:07:30 2019 -0800
+++ b/src/hotspot/share/gc/g1/g1SATBMarkQueueSet.cpp	Tue Mar 05 19:54:33 2019 -0500
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2018, 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
@@ -38,21 +38,19 @@
                                     Monitor* cbl_mon,
                                     BufferNode::Allocator* allocator,
                                     size_t process_completed_buffers_threshold,
-                                    uint buffer_enqueue_threshold_percentage,
-                                    Mutex* lock) {
+                                    uint buffer_enqueue_threshold_percentage) {
   SATBMarkQueueSet::initialize(cbl_mon,
                                allocator,
                                process_completed_buffers_threshold,
-                               buffer_enqueue_threshold_percentage,
-                               lock);
+                               buffer_enqueue_threshold_percentage);
   _g1h = g1h;
 }
 
-void G1SATBMarkQueueSet::handle_zero_index_for_thread(JavaThread* t) {
+void G1SATBMarkQueueSet::handle_zero_index_for_thread(Thread* t) {
   G1ThreadLocalData::satb_mark_queue(t).handle_zero_index();
 }
 
-SATBMarkQueue& G1SATBMarkQueueSet::satb_queue_for_thread(JavaThread* const t) const{
+SATBMarkQueue& G1SATBMarkQueueSet::satb_queue_for_thread(Thread* const t) const{
   return G1ThreadLocalData::satb_mark_queue(t);
 }