Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android

[firefly-linux-kernel-4.4.55.git] / arch / arm64 / include / asm / cmpxchg.h

diff --git a/arch/arm64/include/asm/cmpxchg.h b/arch/arm64/include/asm/cmpxchg.h
index 014328e80a4bbbb0dac972fc04ec9260628e52c3..73eb0736613e7d75cb0f3b0b98d221438c45a170 100644 (file)
--- a/arch/arm64/include/asm/cmpxchg.h
+++ b/arch/arm64/include/asm/cmpxchg.h
@@ -167,8 +167,8 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old,
 ({ \
        __typeof__(*(ptr)) __ret; \
        __ret = (__typeof__(*(ptr))) \
-       __cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \
-               sizeof(*(ptr))); \
+               __cmpxchg_mb((ptr), (unsigned long)(o), (unsigned long)(n), \
+                            sizeof(*(ptr))); \
        __ret; \
 })
 
@@ -176,8 +176,8 @@ static inline unsigned long __cmpxchg_mb(volatile void *ptr, unsigned long old,
 ({ \
        __typeof__(*(ptr)) __ret; \
        __ret = (__typeof__(*(ptr))) \
-       __cmpxchg((ptr), (unsigned long)(o), \
-               (unsigned long)(n), sizeof(*(ptr))); \
+               __cmpxchg((ptr), (unsigned long)(o), \
+                         (unsigned long)(n), sizeof(*(ptr))); \
        __ret; \
 })