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

Commit 4aef66c8 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar
Browse files

locking/atomic, arch/arc: Fix build 



Resolve conflict between commits:

  fbffe892 ("locking/atomic, arch/arc: Implement atomic_fetch_{add,sub,and,andnot,or,xor}()")

and:

  ed6aefed ("Revert "ARCv2: spinlock/rwlock/atomics: Delayed retry of failed SCOND with exponential backoff"")

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Nigel Topham <ntopham@synopsys.com>
Cc: Noam Camus <noamc@ezchip.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Vineet Gupta <vgupta@synopsys.com>
Cc: linux-kernel@vger.kernel.org
Cc: linux-snps-arc@lists.infradead.org
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 86a3b5f3

arch/arc/include/asm/atomic.h

+0 −8
Original line number Diff line number Diff line
@@ -71,7 +71,6 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \ 
static inline int atomic_fetch_##op(int i, atomic_t *v)			\

{									\

	unsigned int val, orig;						\

	SCOND_FAIL_RETRY_VAR_DEF                                        \

									\

	/*								\

	 * Explicit full memory barrier needed before/after as		\
@@ -84,11 +83,8 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ 
	"	" #asm_op " %[val], %[orig], %[i]	\n"		\

	"	scond   %[val], [%[ctr]]		\n"		\

	"						\n"		\

	SCOND_FAIL_RETRY_ASM						\

									\

	: [val]	"=&r"	(val),						\

	  [orig] "=&r" (orig)						\

	  SCOND_FAIL_RETRY_VARS						\

	: [ctr]	"r"	(&v->counter),					\

	  [i]	"ir"	(i)						\

	: "cc");							\
@@ -199,10 +195,6 @@ ATOMIC_OPS(andnot, &= ~, bic) 
ATOMIC_OPS(or, |=, or)

ATOMIC_OPS(xor, ^=, xor)



#undef SCOND_FAIL_RETRY_VAR_DEF

#undef SCOND_FAIL_RETRY_ASM

#undef SCOND_FAIL_RETRY_VARS



#else /* CONFIG_ARC_PLAT_EZNPS */



static inline int atomic_read(const atomic_t *v)