x86-32: Fix atomic64_inc_not_zero return value convention

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>

2 files changed, 2 insertions, 4 deletions

diff --git a/arch/x86/lib/atomic64_386_32.S b/arch/x86/lib/atomic64_386_32.S
index a2f847c88b89..4a5979aa6883 100644
--- a/arch/x86/lib/atomic64_386_32.S
+++ b/arch/x86/lib/atomic64_386_32.S
@@ -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_
 
diff --git a/arch/x86/lib/atomic64_cx8_32.S b/arch/x86/lib/atomic64_cx8_32.S
index d0e37b189f82..71e080de3352 100644
--- a/arch/x86/lib/atomic64_cx8_32.S
+++ b/arch/x86/lib/atomic64_cx8_32.S
@@ -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)