public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

x86-32: Fix atomic64_add_unless return value convention

Browse source 
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>
This commit is contained in:
Luca Barbieri 2010-03-01 19:55:46 +01:00 • committed by H. Peter Anvin
parent 9efbcd5902
commit 6e6104fe08
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/lib/atomic64_386_32.S
View file

@ -133,13 +133,13 @@ BEGIN add_unless %ecx
1: 1:
movl %eax, ($v) movl %eax, ($v)
movl %edx, 4($v) movl %edx, 4($v)
xorl %eax, %eax movl $1, %eax
2: 2:
RETURN RETURN
3: 3:
cmpl %edx, %edi cmpl %edx, %edi
jne 1b jne 1b
movl $1, %eax xorl %eax, %eax
jmp 2b jmp 2b
END_ END_

4
arch/x86/lib/atomic64_cx8_32.S
View file

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