Mercurial > hg > openjdk > aarch64-port > hotspot

changeset 7547:e97a048e045a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author aph
date Tue, 09 Sep 2014 13:59:22 -0400
parents b5dc2da31ba5 (current diff) 7f4c970a6b0c (diff)
children a6df78e590bb
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp	Tue Sep 09 09:32:14 2014 -0400
+++ b/src/os_cpu/linux_aarch64/vm/atomic_linux_aarch64.inline.hpp	Tue Sep 09 13:59:22 2014 -0400
@@ -117,7 +117,7 @@
 
 inline intptr_t Atomic::xchg_ptr(intptr_t exchange_value, volatile intptr_t* dest)
 {
-  jint res = __sync_lock_test_and_set (dest, exchange_value);
+  intptr_t res = __sync_lock_test_and_set (dest, exchange_value);
   FULL_MEM_BARRIER;
   return res;
 }