locking/atomic, arch/arc: Fix build
authorPeter Zijlstra <peterz@infradead.org>
Fri, 17 Jun 2016 15:02:01 +0000 (17:02 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 20 Jun 2016 09:25:49 +0000 (11:25 +0200)
commit4aef66c8ae91d00affeeb24cfb176b53354ac969
tree5196ad66331b39a28166a4b8c70701a6f476a34f
parent86a3b5f34fc1fb307abef4fde76bebd3edce0324
locking/atomic, arch/arc: Fix build

Resolve conflict between commits:

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

and:

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

Reported-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Peter 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: Ingo Molnar <mingo@kernel.org>
arch/arc/include/asm/atomic.h