From patchwork Tue Jul 26 23:57:56 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikulas Patocka X-Patchwork-Id: 1009792 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 p6QNvxgS013196 for ; Tue, 26 Jul 2011 23:57:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752542Ab1GZX56 (ORCPT ); Tue, 26 Jul 2011 19:57:58 -0400 Received: from artax.karlin.mff.cuni.cz ([195.113.26.195]:36622 "EHLO artax.karlin.mff.cuni.cz" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751064Ab1GZX56 (ORCPT ); Tue, 26 Jul 2011 19:57:58 -0400 Received: by artax.karlin.mff.cuni.cz (Postfix, from userid 17421) id A96D998046; Wed, 27 Jul 2011 01:57:56 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by artax.karlin.mff.cuni.cz (Postfix) with ESMTP id A7C3C9800D; Wed, 27 Jul 2011 01:57:56 +0200 (CEST) Date: Wed, 27 Jul 2011 01:57:56 +0200 (CEST) From: Mikulas Patocka To: "James E.J. Bottomley" cc: linux-parisc@vger.kernel.org Subject: [PATCH] fix atomic64 on PA-RISC In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) X-Personality-Disorder: Schizoid MIME-Version: 1.0 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]); Tue, 26 Jul 2011 23:57:59 +0000 (UTC) Fix atomic64 on PA-RISC Signed-off-by: Mikulas Patocka --- arch/parisc/include/asm/atomic.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-parisc" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Index: linux-3.0-devel/arch/parisc/include/asm/atomic.h =================================================================== --- linux-3.0-devel.orig/arch/parisc/include/asm/atomic.h 2011-07-27 01:27:03.000000000 +0200 +++ linux-3.0-devel/arch/parisc/include/asm/atomic.h 2011-07-27 01:30:44.000000000 +0200 @@ -259,10 +259,10 @@ static __inline__ int atomic_add_unless( #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);