--- a/hotspot/src/share/vm/runtime/vmStructs.cpp Mon Oct 13 22:11:39 2014 +0200
+++ b/hotspot/src/share/vm/runtime/vmStructs.cpp Tue Oct 14 10:32:12 2014 -0700
@@ -1070,8 +1070,8 @@
volatile_nonstatic_field(ObjectMonitor, _header, markOop) \
unchecked_nonstatic_field(ObjectMonitor, _object, sizeof(void *)) /* NOTE: no type */ \
unchecked_nonstatic_field(ObjectMonitor, _owner, sizeof(void *)) /* NOTE: no type */ \
- volatile_nonstatic_field(ObjectMonitor, _count, intptr_t) \
- volatile_nonstatic_field(ObjectMonitor, _waiters, intptr_t) \
+ volatile_nonstatic_field(ObjectMonitor, _count, jint) \
+ volatile_nonstatic_field(ObjectMonitor, _waiters, jint) \
volatile_nonstatic_field(ObjectMonitor, _recursions, intptr_t) \
nonstatic_field(ObjectMonitor, FreeNext, ObjectMonitor*) \
volatile_nonstatic_field(BasicLock, _displaced_header, markOop) \
@@ -2507,6 +2507,12 @@
declare_constant(Deoptimization::Action_make_not_compilable) \
declare_constant(Deoptimization::Action_LIMIT) \
\
+ /***************************************************/ \
+ /* DEFAULT_CACHE_LINE_SIZE (globalDefinitions.hpp) */ \
+ /***************************************************/ \
+ \
+ declare_constant(DEFAULT_CACHE_LINE_SIZE) \
+ \
/*********************/ \
/* Matcher (C2 only) */ \
/*********************/ \