summaryrefslogtreecommitdiffstats
path: root/vm/Atomic.cpp
diff options
context:
space:
mode:
authorElliott Hughes <enh@google.com>2012-05-03 07:20:21 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-05-03 07:20:21 -0700
commit901167c1d78403bedcb48a20f46a971fae392a27 (patch)
treed984b0eeba4c1a7eb27eff9060c0049b236ebd1c /vm/Atomic.cpp
parenta1b6477b6ad6a78ede584d0638d0df3dac925ef3 (diff)
parente6bdc430f38ef9c2e74ecdb0cee5aa04848e71fc (diff)
downloadandroid_dalvik-901167c1d78403bedcb48a20f46a971fae392a27.tar.gz
android_dalvik-901167c1d78403bedcb48a20f46a971fae392a27.tar.bz2
android_dalvik-901167c1d78403bedcb48a20f46a971fae392a27.zip
am e6bdc430: Merge "Fix a bug in dvmQuasiAtomicsShutdown."
* commit 'e6bdc430f38ef9c2e74ecdb0cee5aa04848e71fc': Fix a bug in dvmQuasiAtomicsShutdown.
Diffstat (limited to 'vm/Atomic.cpp')
-rw-r--r--vm/Atomic.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/vm/Atomic.cpp b/vm/Atomic.cpp
index f0f548927..ac5d8ac3a 100644
--- a/vm/Atomic.cpp
+++ b/vm/Atomic.cpp
@@ -184,7 +184,7 @@ void dvmQuasiAtomicsStartup() {
void dvmQuasiAtomicsShutdown() {
for (size_t i = 0; i < kSwapLockCount; ++i) {
pthread_mutex_t* m = gSwapLocks[i];
- gSwapLocks[kSwapLockCount] = NULL;
+ gSwapLocks[i] = NULL;
dvmDestroyMutex(m);
delete m;
}