# HG changeset patch
# User brutisso
# Date 1372621327 -7200
# Node ID b307449603510a42920f4ee6ede6d5f1418fc638
# Parent  3ea89789ba3991a20cea17e3d3e7dac9de738620
8014022: G1: Non Java threads should lock the shared SATB queue lock without safepoint checks.
Reviewed-by: tschatzl, brutisso, jmasa, ysr
Contributed-by: per.liden@oracle.com

diff -r 3ea89789ba39 -r b30744960351 src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
--- a/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp	Fri Jun 28 18:28:17 2013 +0200
+++ b/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp	Sun Jun 30 21:42:07 2013 +0200
@@ -47,7 +47,7 @@
     JavaThread* jt = (JavaThread*)thr;
     jt->satb_mark_queue().enqueue(pre_val);
   } else {
-    MutexLocker x(Shared_SATB_Q_lock);
+    MutexLockerEx x(Shared_SATB_Q_lock, Mutex::_no_safepoint_check_flag);
     JavaThread::satb_mark_queue_set().shared_satb_queue()->enqueue(pre_val);
   }
 }