From patchwork Sat Jun 11 18:42:06 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John David Anglin X-Patchwork-Id: 872162 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p5BIgBAk002893 for ; Sat, 11 Jun 2011 18:42:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752437Ab1FKSmJ (ORCPT ); Sat, 11 Jun 2011 14:42:09 -0400 Received: from hiauly1.hia.nrc.ca ([132.246.10.84]:2682 "EHLO hiauly1.hia.nrc.ca" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751730Ab1FKSmI (ORCPT ); Sat, 11 Jun 2011 14:42:08 -0400 Received: by hiauly1.hia.nrc.ca (Postfix, from userid 1000) id F22E7531A; Sat, 11 Jun 2011 14:42:06 -0400 (EDT) Date: Sat, 11 Jun 2011 14:42:06 -0400 From: John David Anglin To: linux-parisc@vger.kernel.org Cc: kyle@mcmartin.ca, deller@gmx.de, jejb@parisc-linux.org Subject: [PATCH] parisc, fix return type of __atomic64_add_return Message-ID: <20110611184205.GA27903@hiauly1.hia.nrc.ca> Reply-To: John David Anglin MIME-Version: 1.0 Content-Disposition: inline Organization: nrc.ca User-Agent: Mutt/1.5.16 (2007-06-09) Sender: linux-parisc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-parisc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Sat, 11 Jun 2011 18:42:11 +0000 (UTC) The return type of __atomic64_add_return of should be s64 or long, not int. This fixes the atomic64 test failure that I previously reported. Signed-off-by: John David Anglin Cc: Kyle McMartin Cc: Helge Deller Cc: "James E.J. Bottomley" Dave diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h index f819559..26fd114 100644 --- a/arch/parisc/include/asm/atomic.h +++ b/arch/parisc/include/asm/atomic.h @@ -259,10 +259,10 @@ static __inline__ int atomic_add_unless(atomic_t *v, int a, int u) #define ATOMIC64_INIT(i) ((atomic64_t) { (i) }) -static __inline__ int +static __inline__ s64 __atomic64_add_return(s64 i, atomic64_t *v) { - int ret; + s64 ret; unsigned long flags; _atomic_spin_lock_irqsave(v, flags);