diff options
author | Peter Zijlstra <[email protected]> | 2016-06-17 17:02:01 +0200 |
---|---|---|
committer | Ingo Molnar <[email protected]> | 2016-06-20 11:25:49 +0200 |
commit | 4aef66c8ae91d00affeeb24cfb176b53354ac969 (patch) | |
tree | 5196ad66331b39a28166a4b8c70701a6f476a34f /tools/perf/scripts/python/export-to-postgresql.py | |
parent | 86a3b5f34fc1fb307abef4fde76bebd3edce0324 (diff) |
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 <[email protected]>
Signed-off-by: Peter Zijlstra (Intel) <[email protected]>
Cc: Linus Torvalds <[email protected]>
Cc: Nigel Topham <[email protected]>
Cc: Noam Camus <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: Vineet Gupta <[email protected]>
Cc: [email protected]
Cc: [email protected]
Signed-off-by: Ingo Molnar <[email protected]>
Diffstat (limited to 'tools/perf/scripts/python/export-to-postgresql.py')
0 files changed, 0 insertions, 0 deletions