diff options
| author | Colin Cross <ccross@android.com> | 2014-01-24 00:41:20 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-01-24 00:41:20 +0000 |
| commit | adc09abb850081bcf198a33e29b7fe370c7bf00c (patch) | |
| tree | a464fcb28e242b6f058d76191dd6a069c17a607a /include/cutils | |
| parent | 026ec15670270dcf8839deacbdd950bfc655d5f4 (diff) | |
| parent | 7d076b3bf32e0d211d9d27964cc74dafd65afee3 (diff) | |
| download | system_core-adc09abb850081bcf198a33e29b7fe370c7bf00c.zip system_core-adc09abb850081bcf198a33e29b7fe370c7bf00c.tar.gz system_core-adc09abb850081bcf198a33e29b7fe370c7bf00c.tar.bz2 | |
am 7d076b3b: am b36cfdb7: am 4b53b014: am 5bd11b48: Merge changes Ib13d9654,I98723ccd
* commit '7d076b3bf32e0d211d9d27964cc74dafd65afee3':
system/core: remove $(KERNEL_HEADERS) from includes
libcutils: fix atomic_memory_store_barrier
Diffstat (limited to 'include/cutils')
| -rw-r--r-- | include/cutils/atomic-aarch64.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/cutils/atomic-aarch64.h b/include/cutils/atomic-aarch64.h index 927379f..4562ad0 100644 --- a/include/cutils/atomic-aarch64.h +++ b/include/cutils/atomic-aarch64.h @@ -66,7 +66,7 @@ void android_memory_barrier(void) extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void) { - __asm__ __volatile__ ("dmb isht" : : : "memory"); + __asm__ __volatile__ ("dmb ishst" : : : "memory"); } #endif |