Skip to content

Commit

Permalink
x86-32: Fix atomic64_inc_not_zero return value convention
Browse files Browse the repository at this point in the history
atomic64_inc_not_zero must return 1 if it perfomed the add and 0 otherwise.
It was doing the opposite thing.

Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
LKML-Reference: <1267469749-11878-6-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 25a304f commit f3e8313
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
3 changes: 1 addition & 2 deletions arch/x86/lib/atomic64_386_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,12 @@ BEGIN inc_not_zero %esi
adcl $0, %edx
movl %eax, ($v)
movl %edx, 4($v)
xorl %eax, %eax
movl $1, %eax
2:
RETURN
3:
testl %edx, %edx
jne 1b
movl $1, %eax
jmp 2b
END_

Expand Down
3 changes: 1 addition & 2 deletions arch/x86/lib/atomic64_cx8_32.S
Original file line number Diff line number Diff line change
Expand Up @@ -212,14 +212,13 @@ ENTRY(atomic64_inc_not_zero_cx8)
cmpxchg8b (%esi)
jne 1b

xorl %eax, %eax
movl $1, %eax
3:
RESTORE ebx
ret
4:
testl %edx, %edx
jne 2b
movl $1, %eax
jmp 3b
CFI_ENDPROC
ENDPROC(atomic64_inc_not_zero_cx8)

0 comments on commit f3e8313

Please sign in to comment.