summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDmitry Petrochenko <dmitry.petrochenko@intel.com>2014-07-28 17:40:16 +0700
committerDmitry Petrochenko <dmitry.petrochenko@intel.com>2014-08-04 01:38:46 +0000
commit8d82de5d7b04b8f43e7d2bb7ee8a66b0c7e71e1b (patch)
tree701893f3cbb672aac845dac8441deef41d928db1
parent89c210bf418a152ccabfbbf853ddcce33aea450d (diff)
downloadart-8d82de5d7b04b8f43e7d2bb7ee8a66b0c7e71e1b.zip
art-8d82de5d7b04b8f43e7d2bb7ee8a66b0c7e71e1b.tar.gz
art-8d82de5d7b04b8f43e7d2bb7ee8a66b0c7e71e1b.tar.bz2
ART: Fix lock max count definition
The lock max count should utilize 14 bits since 2 highest bits are reserved for lock state. Change-Id: I9d562f7bca9c0853231800a706a8523204e8aa9d Signed-off-by: Dmitry Petrochenko <dmitry.petrochenko@intel.com> Signed-off-by: Serguei Katkov <serguei.i.katkov@intel.com>
-rw-r--r--runtime/lock_word.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/lock_word.h b/runtime/lock_word.h
index ab86eaa..e585412 100644
--- a/runtime/lock_word.h
+++ b/runtime/lock_word.h
@@ -65,7 +65,7 @@ class LockWord {
kThinLockOwnerMask = (1 << kThinLockOwnerSize) - 1,
// Count in higher bits.
kThinLockCountShift = kThinLockOwnerSize + kThinLockOwnerShift,
- kThinLockCountMask = (1 << kThinLockCountShift) - 1,
+ kThinLockCountMask = (1 << kThinLockCountSize) - 1,
kThinLockMaxCount = kThinLockCountMask,
// State in the highest bits.