From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751620Ab0CARPK (ORCPT ); Mon, 1 Mar 2010 12:15:10 -0500 Received: from fg-out-1718.google.com ([72.14.220.154]:57512 "EHLO fg-out-1718.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751491Ab0CARPH (ORCPT ); Mon, 1 Mar 2010 12:15:07 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; b=a3ezAn8NoHBnsLyma7vFkVmXraXbY67bXKHF1PCqoSYuA8hO51KHMIEs8Zfe1cXKJt F+fFaoeQZ9gMVdU+mUbNtTgh1zVSytf2BZ4zQJlWx2SmNePe6sfVIw4pdOHiTahH11yL ZTQ6GmxvKJnC/XLjh2Lfkuhq4FWgOygHUPotk= From: Luca Barbieri To: hpa@zytor.com Cc: mingo@elte.hu, a.p.zijlstra@chello.nl, paulus@samba.org, linux-kernel@vger.kernel.org, Luca Barbieri Subject: [PATCH 2/3] x86: fix atomic64_add_unless return value convention Date: Mon, 1 Mar 2010 18:14:59 +0100 Message-Id: <1267463700-25524-3-git-send-email-luca@luca-barbieri.com> X-Mailer: git-send-email 1.6.6.1.476.g01ddb In-Reply-To: <1267463700-25524-1-git-send-email-luca@luca-barbieri.com> References: <1267463700-25524-1-git-send-email-luca@luca-barbieri.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Reported-by: H. Peter Anvin Signed-off-by: Luca Barbieri --- 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