comparison src/os_cpu/linux_x86/vm/os_linux_x86.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 e522a00b91aa d2f8c38e543d
children 5fc51c1ecdeb
comparison
equal deleted inserted replaced
7163:2ed8d74e5984 7212:291ffc492eb6
21 * questions. 21 * questions.
22 * 22 *
23 */ 23 */
24 24
25 // no precompiled headers 25 // no precompiled headers
26 #include "assembler_x86.inline.hpp" 26 #include "asm/macroAssembler.hpp"
27 #include "classfile/classLoader.hpp" 27 #include "classfile/classLoader.hpp"
28 #include "classfile/systemDictionary.hpp" 28 #include "classfile/systemDictionary.hpp"
29 #include "classfile/vmSymbols.hpp" 29 #include "classfile/vmSymbols.hpp"
30 #include "code/icBuffer.hpp" 30 #include "code/icBuffer.hpp"
31 #include "code/vtableStubs.hpp" 31 #include "code/vtableStubs.hpp"
32 #include "interpreter/interpreter.hpp" 32 #include "interpreter/interpreter.hpp"
33 #include "jvm_linux.h" 33 #include "jvm_linux.h"
34 #include "memory/allocation.inline.hpp" 34 #include "memory/allocation.inline.hpp"
35 #include "mutex_linux.inline.hpp" 35 #include "mutex_linux.inline.hpp"
36 #include "nativeInst_x86.hpp"
37 #include "os_share_linux.hpp" 36 #include "os_share_linux.hpp"
38 #include "prims/jniFastGetField.hpp" 37 #include "prims/jniFastGetField.hpp"
39 #include "prims/jvm.h" 38 #include "prims/jvm.h"
40 #include "prims/jvm_misc.hpp" 39 #include "prims/jvm_misc.hpp"
41 #include "runtime/arguments.hpp" 40 #include "runtime/arguments.hpp"
46 #include "runtime/javaCalls.hpp" 45 #include "runtime/javaCalls.hpp"
47 #include "runtime/mutexLocker.hpp" 46 #include "runtime/mutexLocker.hpp"
48 #include "runtime/osThread.hpp" 47 #include "runtime/osThread.hpp"
49 #include "runtime/sharedRuntime.hpp" 48 #include "runtime/sharedRuntime.hpp"
50 #include "runtime/stubRoutines.hpp" 49 #include "runtime/stubRoutines.hpp"
50 #include "runtime/thread.inline.hpp"
51 #include "runtime/timer.hpp" 51 #include "runtime/timer.hpp"
52 #include "thread_linux.inline.hpp"
53 #include "utilities/events.hpp" 52 #include "utilities/events.hpp"
54 #include "utilities/vmError.hpp" 53 #include "utilities/vmError.hpp"
55 54
56 // put OS-includes here 55 // put OS-includes here
57 # include <sys/types.h> 56 # include <sys/types.h>