From 36967c98e4a86c50a94cc5c4edee952008574f6f Mon Sep 17 00:00:00 2001
From: Per Liden <per.liden@oracle.com>
Date: Sun, 30 Jun 2013 21:42:07 +0200
Subject: [PATCH] 8014022: G1: Non Java threads should lock the shared SATB
 queue lock without safepoint checks

Reviewed-by: tschatzl, brutisso, jmasa, ysr
---
 .../share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
index 9cee1eb1ba2..218be0c0e40 100644
--- a/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
+++ b/hotspot/src/share/vm/gc_implementation/g1/g1SATBCardTableModRefBS.cpp
@@ -47,7 +47,7 @@ void G1SATBCardTableModRefBS::enqueue(oop pre_val) {
     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);
   }
 }