Patchwork sparc: rename atomic_add_unless

login
register
mail settings
Submitter Josip Rodin
Date Aug. 4, 2011, 9:43 a.m.
Message ID <20110804094315.GA2005@entuzijast.net>
Download mbox | patch
Permalink /patch/108393/
State Accepted
Delegated to: David Miller
Headers show

Comments

Josip Rodin - Aug. 4, 2011, 9:43 a.m.
On Thu, Aug 04, 2011 at 07:39:16PM +1000, Stephen Rothwell wrote:
> Hi Dave,
> 
> On Thu, 04 Aug 2011 01:21:46 -0700 (PDT) David Miller <davem@davemloft.net> wrote:
> >
> > From: Josip Rodin <joy@entuzijast.net>
> > Date: Thu, 28 Jul 2011 12:40:17 +0200
> > 
> > > This patch[0] seems to fix a build issue, but it doesn't fix the
> > > functionality - the previous change[1] changed the return value semantics,
> > > it's now supposed to be to be just the old value, rather than a comparison.
> > > 
> > > [0] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=678624e401b0b7747762b5223fb23f86dcdacc93
> > > [1] http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f24219b4e90cf70ec4a211b17fbabc725a0ddf3c
> > 
> > Stephen please post a fix for this before a 32-bit sparc person
> > loses their filesystem or worse.
> 
> Um, I could try to figure out how to do that, but what I did was respond
> in July 29 to the message above cc'ing the author of the orignal patch in
> the hope that they would write a fix.  Clearly that hope was in vain :-(

It should be fairly trivial:
David Miller - Aug. 4, 2011, 9:48 a.m.
From: Josip Rodin <joy@entuzijast.net>
Date: Thu, 4 Aug 2011 11:43:15 +0200

> It should be fairly trivial:
> 
> diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
> index 8600eb2..1d32b54 100644
> --- a/arch/sparc/lib/atomic32.c
> +++ b/arch/sparc/lib/atomic32.c
> @@ -65,7 +65,7 @@ int __atomic_add_unless(atomic_t *v, int a, int u)
>         if (ret != u)
>                 v->counter += a;
>         spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
> -       return ret != u;
> +       return ret;
>  }
>  EXPORT_SYMBOL(__atomic_add_unless);

Applied, thanks Josip.
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index 8600eb2..1d32b54 100644
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -65,7 +65,7 @@  int __atomic_add_unless(atomic_t *v, int a, int u)
        if (ret != u)
                v->counter += a;
        spin_unlock_irqrestore(ATOMIC_HASH(v), flags);
-       return ret != u;
+       return ret;
 }
 EXPORT_SYMBOL(__atomic_add_unless);