commit f7e88e51b31e64e085b3a564f4b1baa8334d63f1
author Elliott Hughes <enh@google.com> Wed Aug 20 20:22:23 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 20 20:22:23 2014 +0000
tree f258131302a465b4f449852b6a3a2b2db319d8a7
parent 5c16eb07721252a8a5d8ad436319e94d7c974e44
parent 373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7

am 373c7758: Merge "There\'s no non-SMP LP64."

* commit '373c77583f9d8eab88e4321d1a2e2af8f5ae8ea7':
  There's no non-SMP LP64.

include/cutils/atomic-arm64.h

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 @@
     __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 @@
 {
     __asm__ __volatile__ ("dmb ishst" : : : "memory");
 }
-#endif
 
 extern ANDROID_ATOMIC_INLINE
 int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

include/cutils/atomic-mips64.h

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 @@
     __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 @@
 {
     __asm__ __volatile__ ("sync" : : : "memory");
 }
-#endif
 
 extern ANDROID_ATOMIC_INLINE
 int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

include/cutils/atomic-x86_64.h

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 @@
     __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 @@
 {
     android_compiler_barrier();
 }
-#endif
 
 extern ANDROID_ATOMIC_INLINE
 int32_t android_atomic_acquire_load(volatile const int32_t *ptr)