diff options
| author | Elliott Hughes <enh@google.com> | 2014-08-20 20:49:36 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-20 20:49:36 +0000 |
| commit | 3601abb810e7e33902e461ed0386673d3be11af9 (patch) | |
| tree | 8e76e4f1bef52a1e60ac05236a0af7abc6cfb1c4 /include/cutils | |
| parent | 831789a9f257bd929caa2fb927c4b902459cce53 (diff) | |
| parent | f7e88e51b31e64e085b3a564f4b1baa8334d63f1 (diff) | |
| download | system_core-3601abb810e7e33902e461ed0386673d3be11af9.zip system_core-3601abb810e7e33902e461ed0386673d3be11af9.tar.gz system_core-3601abb810e7e33902e461ed0386673d3be11af9.tar.bz2 | |
am f7e88e51: am 373c7758: Merge "There\'s no non-SMP LP64."
* commit 'f7e88e51b31e64e085b3a564f4b1baa8334d63f1':
There's no non-SMP LP64.
Diffstat (limited to 'include/cutils')
| -rw-r--r-- | include/cutils/atomic-arm64.h | 13 | ||||
| -rw-r--r-- | include/cutils/atomic-mips64.h | 11 | ||||
| -rw-r--r-- | include/cutils/atomic-x86_64.h | 13 |
3 files changed, 0 insertions, 37 deletions
diff --git a/include/cutils/atomic-arm64.h b/include/cutils/atomic-arm64.h index 4562ad0..ba5a218 100644 --- a/include/cutils/atomic-arm64.h +++ b/include/cutils/atomic-arm64.h @@ -46,18 +46,6 @@ void android_compiler_barrier(void) __asm__ __volatile__ ("" : : : "memory"); } -#if ANDROID_SMP == 0 -extern ANDROID_ATOMIC_INLINE -void android_memory_barrier(void) -{ - android_compiler_barrier(); -} -extern ANDROID_ATOMIC_INLINE -void android_memory_store_barrier(void) -{ - android_compiler_barrier(); -} -#else extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void) { @@ -68,7 +56,6 @@ void android_memory_store_barrier(void) { __asm__ __volatile__ ("dmb ishst" : : : "memory"); } -#endif extern ANDROID_ATOMIC_INLINE int32_t android_atomic_acquire_load(volatile const int32_t *ptr) diff --git a/include/cutils/atomic-mips64.h b/include/cutils/atomic-mips64.h index 99bbe3a..6215621 100644 --- a/include/cutils/atomic-mips64.h +++ b/include/cutils/atomic-mips64.h @@ -28,16 +28,6 @@ extern ANDROID_ATOMIC_INLINE void android_compiler_barrier(void) __asm__ __volatile__ ("" : : : "memory"); } -#if ANDROID_SMP == 0 -extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void) -{ - android_compiler_barrier(); -} -extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void) -{ - android_compiler_barrier(); -} -#else extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void) { __asm__ __volatile__ ("sync" : : : "memory"); @@ -46,7 +36,6 @@ extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void) { __asm__ __volatile__ ("sync" : : : "memory"); } -#endif extern ANDROID_ATOMIC_INLINE int32_t android_atomic_acquire_load(volatile const int32_t *ptr) diff --git a/include/cutils/atomic-x86_64.h b/include/cutils/atomic-x86_64.h index 5b5c203..025ba19 100644 --- a/include/cutils/atomic-x86_64.h +++ b/include/cutils/atomic-x86_64.h @@ -41,18 +41,6 @@ void android_compiler_barrier(void) __asm__ __volatile__ ("" : : : "memory"); } -#if ANDROID_SMP == 0 -extern ANDROID_ATOMIC_INLINE -void android_memory_barrier(void) -{ - android_compiler_barrier(); -} -extern ANDROID_ATOMIC_INLINE -void android_memory_store_barrier(void) -{ - android_compiler_barrier(); -} -#else extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void) { @@ -63,7 +51,6 @@ void android_memory_store_barrier(void) { android_compiler_barrier(); } -#endif extern ANDROID_ATOMIC_INLINE int32_t android_atomic_acquire_load(volatile const int32_t *ptr) |