On Tue, Jul 26, 2011 at 7:57 PM, Mikulas Patocka
<mikulas@xxxxxxxxxxxxxxxxxxxxxxxx> wrote:
> Fix atomic64 on PA-RISC
>
> Signed-off-by: Mikulas Patocka <mikulas@xxxxxxxxxxxxxxxxxxxxxxxx>
>
> ---
> arch/parisc/include/asm/atomic.h | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> 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);
An identical patch was sent on June 11, titled '[PATCH] parisc, fix
return type of __atomic64_add_return'. If it's not in James tree (or
upstream) by now, I'm not sure why.
Matt
--
To unsubscribe from this list: send the line "unsubscribe linux-parisc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
