Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3601abb8 authored by Elliott Hughes's avatar Elliott Hughes Committed by Android Git Automerger
Browse files

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

* commit 'f7e88e51':
  There's no non-SMP LP64.
parents 831789a9 f7e88e51

include/cutils/atomic-arm64.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -46,18 +46,6 @@ void android_compiler_barrier(void) 
    __asm__ __volatile__ ("" : : : "memory");

    __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

extern ANDROID_ATOMIC_INLINE

void android_memory_barrier(void)

void android_memory_barrier(void)

{

{
@@ -68,7 +56,6 @@ void android_memory_store_barrier(void) 
{

{

    __asm__ __volatile__ ("dmb ishst" : : : "memory");

    __asm__ __volatile__ ("dmb ishst" : : : "memory");

}

}

#endif





extern ANDROID_ATOMIC_INLINE

extern ANDROID_ATOMIC_INLINE

int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

include/cutils/atomic-mips64.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -28,16 +28,6 @@ extern ANDROID_ATOMIC_INLINE void android_compiler_barrier(void) 
    __asm__ __volatile__ ("" : : : "memory");

    __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)

extern ANDROID_ATOMIC_INLINE void android_memory_barrier(void)

{

{

    __asm__ __volatile__ ("sync" : : : "memory");

    __asm__ __volatile__ ("sync" : : : "memory");
@@ -46,7 +36,6 @@ extern ANDROID_ATOMIC_INLINE void android_memory_store_barrier(void) 
{

{

    __asm__ __volatile__ ("sync" : : : "memory");

    __asm__ __volatile__ ("sync" : : : "memory");

}

}

#endif





extern ANDROID_ATOMIC_INLINE

extern ANDROID_ATOMIC_INLINE

int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

include/cutils/atomic-x86_64.h

+0 −13
Original line number Original line Diff line number Diff line
@@ -41,18 +41,6 @@ void android_compiler_barrier(void) 
    __asm__ __volatile__ ("" : : : "memory");

    __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

extern ANDROID_ATOMIC_INLINE

void android_memory_barrier(void)

void android_memory_barrier(void)

{

{
@@ -63,7 +51,6 @@ void android_memory_store_barrier(void) 
{

{

    android_compiler_barrier();

    android_compiler_barrier();

}

}

#endif





extern ANDROID_ATOMIC_INLINE

extern ANDROID_ATOMIC_INLINE

int32_t android_atomic_acquire_load(volatile const int32_t *ptr)

int32_t android_atomic_acquire_load(volatile const int32_t *ptr)