Commit 2db09827 authored by Chris Metcalf's avatar Chris Metcalf

arch/tile: Fix bug in support for atomic64_xx() ops.

This wasn't properly tested until the perf-event subsystem started
to get brought up under the tile architecture.

The bug caused bogus atomic64_cmpxchg() values to be returned,
among other things.
Signed-off-by: default avatarChris Metcalf <cmetcalf@tilera.com>
Acked-by: default avatarArnd Bergmann <arnd@arndb.de>
parent 863fbac6
...@@ -89,11 +89,11 @@ STD_ENTRY_SECTION(__atomic\name, .text.atomic) ...@@ -89,11 +89,11 @@ STD_ENTRY_SECTION(__atomic\name, .text.atomic)
lh r22, r0 lh r22, r0
.else .else
lw r22, r0 lw r22, r0
addi r23, r0, 4 addi r28, r0, 4
.endif .endif
} }
.ifc \bitwidth,64 .ifc \bitwidth,64
lw r23, r23 lw r23, r28
.endif .endif
\body /* set r24, and r25 if 64-bit */ \body /* set r24, and r25 if 64-bit */
{ {
...@@ -109,11 +109,10 @@ STD_ENTRY_SECTION(__atomic\name, .text.atomic) ...@@ -109,11 +109,10 @@ STD_ENTRY_SECTION(__atomic\name, .text.atomic)
sh r0, r24 sh r0, r24
.else .else
sw r0, r24 sw r0, r24
addi r23, r0, 4
.endif .endif
} }
.ifc \bitwidth,64 .ifc \bitwidth,64
sw r23, r25 sw r28, r25
.endif .endif
mf mf
3: { 3: {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment