diff --git a/[refs] b/[refs]
index 1f9093a06e97..186d2d763343 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d9ba5fe76d604514444b1ea0a19f38c6196a46e3
+refs/heads/master: 548c210fbffdb008a80fa41ff0cb3965f185583d
diff --git a/trunk/arch/parisc/include/asm/atomic.h b/trunk/arch/parisc/include/asm/atomic.h
index f81955934aeb..26fd1146dda6 100644
--- a/trunk/arch/parisc/include/asm/atomic.h
+++ b/trunk/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);