comparison src/share/vm/runtime/mutexLocker.cpp @ 7212:291ffc492eb6

Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
author Doug Simon <doug.simon@oracle.com>
date Fri, 14 Dec 2012 14:35:13 +0100
parents 5d0bb7d52783 f34d701e952e
children 836a62f43af9
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
23 */ 23 */
24 24
25 #include "precompiled.hpp" 25 #include "precompiled.hpp"
26 #include "runtime/mutexLocker.hpp" 26 #include "runtime/mutexLocker.hpp"
27 #include "runtime/safepoint.hpp" 27 #include "runtime/safepoint.hpp"
28 #include "runtime/thread.inline.hpp"
28 #include "runtime/threadLocalStorage.hpp" 29 #include "runtime/threadLocalStorage.hpp"
29 #include "runtime/vmThread.hpp" 30 #include "runtime/vmThread.hpp"
30 #ifdef TARGET_OS_FAMILY_linux
31 # include "thread_linux.inline.hpp"
32 #endif
33 #ifdef TARGET_OS_FAMILY_solaris
34 # include "thread_solaris.inline.hpp"
35 #endif
36 #ifdef TARGET_OS_FAMILY_windows
37 # include "thread_windows.inline.hpp"
38 #endif
39 #ifdef TARGET_OS_FAMILY_bsd
40 # include "thread_bsd.inline.hpp"
41 #endif
42 31
43 // Mutexes used in the VM (see comment in mutexLocker.hpp): 32 // Mutexes used in the VM (see comment in mutexLocker.hpp):
44 // 33 //
45 // Note that the following pointers are effectively final -- after having been 34 // Note that the following pointers are effectively final -- after having been
46 // set at JVM startup-time, they should never be subsequently mutated. 35 // set at JVM startup-time, they should never be subsequently mutated.