[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1267463700-25524-3-git-send-email-luca@luca-barbieri.com>
Date: Mon, 1 Mar 2010 18:14:59 +0100
From: Luca Barbieri <luca@...a-barbieri.com>
To: hpa@...or.com
Cc: mingo@...e.hu, a.p.zijlstra@...llo.nl, paulus@...ba.org,
linux-kernel@...r.kernel.org,
Luca Barbieri <luca@...a-barbieri.com>
Subject: [PATCH 2/3] x86: fix atomic64_add_unless return value convention
Reported-by: H. Peter Anvin <hpa@...or.com>
Signed-off-by: Luca Barbieri <luca@...a-barbieri.com>
---
arch/x86/lib/atomic64_386_32.S | 4 ++--
arch/x86/lib/atomic64_cx8_32.S | 4 ++--
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 5db07fe..a2f847c 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 e49c4eb..d0e37b1 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)
--
1.6.6.1.476.g01ddb
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists