merge in ics-release history after reset to master

diff --git a/vm/Atomic.cpp b/vm/Atomic.cpp
index 927a926..98ff7d0 100644 (file)
--- a/vm/Atomic.cpp
+++ b/vm/Atomic.cpp
@@ -60,7 +60,7 @@ static inline int64_t dvmQuasiAtomicSwap64Body(int64_t value,
 
 int64_t dvmQuasiAtomicSwap64(int64_t value, volatile int64_t* addr)
 {
-    return dvmQuasiAtomicSwap64Body(value, adddr);
+    return dvmQuasiAtomicSwap64Body(value, addr);
 }
 
 int64_t dvmQuasiAtomicSwap64Sync(int64_t value, volatile int64_t* addr)