On Fri, Apr 22, 2016 at 02:02:56PM +0100, Will Deacon wrote: > On Fri, Apr 22, 2016 at 11:04:40AM +0200, Peter Zijlstra wrote: > > --- a/arch/arm64/include/asm/atomic.h > > +++ b/arch/arm64/include/asm/atomic.h > > @@ -128,8 +128,6 @@ > > #define __atomic_add_unless(v, a, u) ___atomic_add_unless(v, a, u,) > > #define atomic_andnot atomic_andnot > > > > -#define atomic_fetch_or atomic_fetch_or > > For some reason, you added this twice to our atomic.h, so there's still > one left after this patch. Ah, yes. One was because of the whole _relaxed generate business, this one is because of this generic atomic_fetch_or() thing. I went through the arch/*/include/asm/atomic*.h files pretty much without thinking to add this one. The end result after this patch should be good though, we have atomic_fetch_or_relaxed and do not want to generate atomic_fetch_or() using smp_mb__{before,after}_atomic() because arm64 is 'special' :-) -- To unsubscribe from this list: send the line "unsubscribe linux-arch" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html