From: Will Deacon <will.deacon@arm.com>
Date: Wed, 29 Jul 2015 14:16:22 +0000 (+0100)
Subject: arm64: lse: fix lse cmpxchg code indentation
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=484c96dbb26965d712a808ab9e8b00090455bdf6;p=deliverable%2Flinux.git

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

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"		\