From: John David Anglin <dave@hiauly1.hia.nrc.ca>
Date: Sat, 11 Jun 2011 18:42:06 +0000 (-0400)
Subject: [PARISC] fix return type of __atomic64_add_return
X-Git-Tag: Ubuntu-5.4-5.4.0-11.14~20878^2~1
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=548c210fbffdb008a80fa41ff0cb3965f185583d;p=mirror_ubuntu-focal-kernel.git

[PARISC] fix return type of __atomic64_add_return

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 <dave.anglin@nrc-cnrc.gc.ca>
Cc: stable@kernel.org
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
---

diff --git a/arch/parisc/include/asm/atomic.h b/arch/parisc/include/asm/atomic.h
index f81955934aeb..26fd1146dda6 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);