From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753426Ab0CAS4R (ORCPT ); Mon, 1 Mar 2010 13:56:17 -0500 Received: from mail-fx0-f219.google.com ([209.85.220.219]:50974 "EHLO mail-fx0-f219.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751939Ab0CAS4L (ORCPT ); Mon, 1 Mar 2010 13:56:11 -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=ktmIcgmHucBdRo59vKjwYr0p8wV/HclMXxWLvZzkiN3gVJPpuw80DBXNNxnGz7wQrj Mtr5ONpr1szyv+qLtngw4KGiRLTLOR4WOMEC8a7vQ/LGrimCYA5kblX7WogWHf3iv9G3 yfy/XyywBli5ngeqoYevR+msi6CzpXvGkNO9Q= 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 5/5] x86-32: fix atomic64_inc_not_zero return value convention Date: Mon, 1 Mar 2010 19:55:49 +0100 Message-Id: <1267469749-11878-6-git-send-email-luca@luca-barbieri.com> X-Mailer: git-send-email 1.6.6.1.476.g01ddb In-Reply-To: <1267469749-11878-1-git-send-email-luca@luca-barbieri.com> References: <1267469749-11878-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 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 --- 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