diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2016-06-17 17:02:01 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-20 11:25:49 +0200 |
| commit | 4aef66c8ae91d00affeeb24cfb176b53354ac969 (patch) | |
| tree | 5196ad66331b39a28166a4b8c70701a6f476a34f /arch/arm/mach-axxia | |
| parent | 86a3b5f34fc1fb307abef4fde76bebd3edce0324 (diff) | |
| download | op-kernel-dev-4aef66c8ae91d00affeeb24cfb176b53354ac969.zip op-kernel-dev-4aef66c8ae91d00affeeb24cfb176b53354ac969.tar.gz | |
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>
Diffstat (limited to 'arch/arm/mach-axxia')
0 files changed, 0 insertions, 0 deletions
