summaryrefslogtreecommitdiffstats
path: root/arch/x86/lib
diff options
context:
space:
mode:
authorLuca Barbieri <luca@luca-barbieri.com>2010-03-01 19:55:46 +0100
committerH. Peter Anvin <hpa@zytor.com>2010-03-01 11:38:46 -0800
commit6e6104fe085026e6ef82cc5cc303d6c8ceb7e411 (patch)
tree0cd6c0a5574735f58563e4e96c68ec91a6c40033 /arch/x86/lib
parent9efbcd590243045111670c171a951923b877b57d (diff)
downloadlinux-6e6104fe085026e6ef82cc5cc303d6c8ceb7e411.tar.gz
linux-6e6104fe085026e6ef82cc5cc303d6c8ceb7e411.tar.bz2
linux-6e6104fe085026e6ef82cc5cc303d6c8ceb7e411.zip
x86-32: Fix atomic64_add_unless return value convention
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>
Diffstat (limited to 'arch/x86/lib')
-rw-r--r--arch/x86/lib/atomic64_386_32.S4
-rw-r--r--arch/x86/lib/atomic64_cx8_32.S4
2 files changed, 4 insertions, 4 deletions
diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
index 5db07fe4a0ca..a2f847c88b89 100644
--- a/arch/x86/lib/atomic64_386_32.S
+++ b/arch/x86/lib/atomic64_386_32.S
@@ -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_
diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
index e49c4ebca9f4..d0e37b189f82 100644
--- a/arch/x86/lib/atomic64_cx8_32.S
+++ b/arch/x86/lib/atomic64_cx8_32.S
@@ -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
@@ -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)