Skip to content

Commit

Permalink
x86-32: Fix atomic64_add_unless return value convention
Browse files Browse the repository at this point in the history
atomic64_add_unless must return 1 if it perfomed the add and 0 otherwise.
The implementation did the opposite thing.

Reported-by: H. Peter Anvin <hpa@zytor.com>
Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
LKML-Reference: <1267469749-11878-3-git-send-email-luca@luca-barbieri.com>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
  • Loading branch information
Luca Barbieri authored and H. Peter Anvin committed Mar 1, 2010
1 parent 9efbcd5 commit 6e6104f
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions arch/x86/lib/atomic64_386_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ BEGIN add_unless %ecx
1:
movl %eax, ($v)
movl %edx, 4($v)
xorl %eax, %eax
movl $1, %eax
2:
RETURN
3:
cmpl %edx, %edi
jne 1b
movl $1, %eax
xorl %eax, %eax
jmp 2b
END_

Expand Down
4 changes: 2 additions & 2 deletions arch/x86/lib/atomic64_cx8_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ ENTRY(atomic64_add_unless_cx8)
cmpxchg8b (%ebp)
jne 1b

xorl %eax, %eax
movl $1, %eax
3:
addl $8, %esp
CFI_ADJUST_CFA_OFFSET -8
Expand All @@ -190,7 +190,7 @@ ENTRY(atomic64_add_unless_cx8)
4:
cmpl %edx, 4(%esp)
jne 2b
movl $1, %eax
xorl %eax, %eax
jmp 3b
CFI_ENDPROC
ENDPROC(atomic64_add_unless_cx8)
Expand Down

0 comments on commit 6e6104f

Please sign in to comment.