From: Luca Barbieri <luca@luca-barbieri.com>
To: hpa@zytor.com
Cc: mingo@elte.hu, a.p.zijlstra@chello.nl, paulus@samba.org,
linux-kernel@vger.kernel.org,
Luca Barbieri <luca@luca-barbieri.com>
Subject: [PATCH 5/5] x86-32: fix atomic64_inc_not_zero return value convention
Date: Mon, 1 Mar 2010 19:55:49 +0100 [thread overview]
Message-ID: <1267469749-11878-6-git-send-email-luca@luca-barbieri.com> (raw)
In-Reply-To: <1267469749-11878-1-git-send-email-luca@luca-barbieri.com>
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>
---
arch/x86/lib/atomic64_386_32.S | 3 +--
arch/x86/lib/atomic64_cx8_32.S | 3 +--
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 a2f847c..4a5979a 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 d0e37b1..71e080d 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)
--
1.6.6.1.476.g01ddb
next prev parent reply other threads:[~2010-03-01 18:56 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-01 18:55 [PATCH 0/5] Fix atomic64 return value conventions (v2) Luca Barbieri
2010-03-01 18:55 ` [PATCH 1/5] lib: fix atomic64_add_unless test Luca Barbieri
2010-03-01 19:58 ` [tip:x86/atomic] lib: Fix " tip-bot for Luca Barbieri
2010-03-01 18:55 ` [PATCH 2/5] x86-32: fix atomic64_add_unless return value convention Luca Barbieri
2010-03-01 19:58 ` [tip:x86/atomic] x86-32: Fix " tip-bot for Luca Barbieri
2010-03-01 18:55 ` [PATCH 3/5] lib: fix " Luca Barbieri
2010-03-01 19:58 ` [tip:x86/atomic] lib: Fix " tip-bot for Luca Barbieri
2010-03-01 18:55 ` [PATCH 4/5] lib: fix atomic64_inc_not_zero test Luca Barbieri
2010-03-01 19:58 ` [tip:x86/atomic] lib: Fix " tip-bot for Luca Barbieri
2010-03-01 18:55 ` Luca Barbieri [this message]
2010-03-01 19:59 ` [tip:x86/atomic] x86-32: Fix atomic64_inc_not_zero return value convention tip-bot for Luca Barbieri
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1267469749-11878-6-git-send-email-luca@luca-barbieri.com \
--to=luca@luca-barbieri.com \
--cc=a.p.zijlstra@chello.nl \
--cc=hpa@zytor.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=paulus@samba.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®