summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2015-07-29 16:16:22 +0200
committerWill Deacon <will.deacon@arm.com>2015-07-29 19:32:09 +0200
commit484c96dbb26965d712a808ab9e8b00090455bdf6 (patch)
tree5ee83538dea60da365f83905f29e03cb27a9493a /arch
parentarm64: remove redundant object file list (diff)
downloadlinux-484c96dbb26965d712a808ab9e8b00090455bdf6.tar.xz
linux-484c96dbb26965d712a808ab9e8b00090455bdf6.zip
arm64: lse: fix lse cmpxchg code indentation
For some reason, the ll/sc cmpxchg asm is all off to the left and awkward to read in conjunction with the following (correctly indented) LSE version. This patch shifts the ll/sc code back to where it should be. Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm64/include/asm/atomic_lse.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/atomic_lse.h b/arch/arm64/include/asm/atomic_lse.h
index f873bf61e17b..55d740e63459 100644
--- a/arch/arm64/include/asm/atomic_lse.h
+++ b/arch/arm64/include/asm/atomic_lse.h
@@ -319,9 +319,9 @@ static inline unsigned long __cmpxchg_case_##name(volatile void *ptr, \
\
asm volatile(ARM64_LSE_ATOMIC_INSN( \
/* LL/SC */ \
- "nop\n" \
- __LL_SC_CMPXCHG(name) \
- "nop", \
+ " nop\n" \
+ __LL_SC_CMPXCHG(name) \
+ " nop", \
/* LSE atomics */ \
" mov " #w "30, %" #w "[old]\n" \
" cas" #mb #sz "\t" #w "30, %" #w "[new], %[v]\n" \