Mercurial > hg > truffle
diff src/share/vm/memory/gcLocker.cpp @ 20804:7848fc12602b
Merge with jdk8u40-b25
author | Gilles Duboscq <gilles.m.duboscq@oracle.com> |
---|---|
date | Tue, 07 Apr 2015 14:58:49 +0200 |
parents | 52b4284cb496 ce8f6bb717c9 |
children |
line wrap: on
line diff
--- a/src/share/vm/memory/gcLocker.cpp Tue Apr 07 11:20:51 2015 +0200 +++ b/src/share/vm/memory/gcLocker.cpp Tue Apr 07 14:58:49 2015 +0200 @@ -26,6 +26,7 @@ #include "memory/gcLocker.inline.hpp" #include "memory/resourceArea.hpp" #include "memory/sharedHeap.hpp" +#include "runtime/thread.inline.hpp" volatile jint GC_locker::_jni_lock_count = 0; volatile bool GC_locker::_needs_gc = false;