From: Dmitry Petrochenko <dmitry.petrochenko@intel.com>
Date: Mon, 28 Jul 2014 10:40:16 +0000 (+0700)
Subject: ART: Fix lock max count definition
X-Git-Tag: android-x86-7.1-r1~889^2~3417^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=8d82de5d7b04b8f43e7d2bb7ee8a66b0c7e71e1b;p=android-x86%2Fart.git

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>
---

diff --git a/runtime/lock_word.h b/runtime/lock_word.h
index ab86eaac7..e585412d0 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.