From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752471AbcFVKRE (ORCPT ); Wed, 22 Jun 2016 06:17:04 -0400 Received: from smtprelay.synopsys.com ([198.182.60.111]:54244 "EHLO smtprelay.synopsys.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750904AbcFVKPn (ORCPT ); Wed, 22 Jun 2016 06:15:43 -0400 Subject: Re: Build failures in -next due to 'locking/atomic, arch/arc: Implement atomic_fetch_{add,sub,and,andnot,or,xor}()' To: Peter Zijlstra , Guenter Roeck References: <57640B08.4090007@roeck-us.net> <20160617143942.GV30154@twins.programming.kicks-ass.net> <20160617144136.GK30927@twins.programming.kicks-ass.net> CC: , "linux-kernel@vger.kernel.org" , Ingo Molnar , Anton Kolesov Newsgroups: gmane.linux.kernel From: Vineet Gupta Message-ID: <576A62C6.5080207@synopsys.com> Date: Wed, 22 Jun 2016 15:34:54 +0530 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.8.0 MIME-Version: 1.0 In-Reply-To: <20160617144136.GK30927@twins.programming.kicks-ass.net> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit X-Originating-IP: [10.12.197.158] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Friday 17 June 2016 08:11 PM, Peter Zijlstra wrote: > On Fri, Jun 17, 2016 at 04:39:42PM +0200, Peter Zijlstra wrote: >> On Fri, Jun 17, 2016 at 07:36:56AM -0700, Guenter Roeck wrote: >>> Hi Peter, >>> >>> I am seeing build failures in -next when trying to build arc / arcv2 targets. >>> >>> arch/arc/include/asm/atomic.h:74:2: error: ‘SCOND_FAIL_RETRY_VAR_DEF’ undeclared >>> arch/arc/include/asm/atomic.h:87:2: error: expected ‘:’ or ‘)’ before ‘SCOND_FAIL_RETRY_ASM’ >>> >>> Problems seem to be caused by 'locking/atomic, arch/arc: Implement >>> atomic_fetch_{add,sub,and,andnot,or,xor}()'. Both SCOND_FAIL_RETRY_VAR_DEF and >>> SCOND_FAIL_RETRY_ASM are undefined. >> >> Crud, I messed up the rebase against the backoff reverts. Lemme go do >> fixups. > > I've misplaced my arc compiler, but does this make it go again? Peter the fixlet below doesn't show up in linux-next yet. Could you please do that soon. Our internal build lords are yelling at me :-) To keep things bisectable, it would be desirable to squash this with the orig commit ! > > > --- > arch/arc/include/asm/atomic.h | 8 -------- > 1 file changed, 8 deletions(-) > > diff --git a/arch/arc/include/asm/atomic.h b/arch/arc/include/asm/atomic.h > index bd9c51cb2bfd..4e3c1b6b0806 100644 > --- a/arch/arc/include/asm/atomic.h > +++ b/arch/arc/include/asm/atomic.h > @@ -71,7 +71,6 @@ static inline int atomic_##op##_return(int i, atomic_t *v) \ > static inline int atomic_fetch_##op(int i, atomic_t *v) \ > { \ > unsigned int val, orig; \ > - SCOND_FAIL_RETRY_VAR_DEF \ > \ > /* \ > * Explicit full memory barrier needed before/after as \ > @@ -84,11 +83,8 @@ static inline int atomic_fetch_##op(int i, atomic_t *v) \ > " " #asm_op " %[val], %[orig], %[i] \n" \ > " scond %[val], [%[ctr]] \n" \ > " \n" \ > - SCOND_FAIL_RETRY_ASM \ > - \ > : [val] "=&r" (val), \ > [orig] "=&r" (orig) \ > - SCOND_FAIL_RETRY_VARS \ > : [ctr] "r" (&v->counter), \ > [i] "ir" (i) \ > : "cc"); \ > @@ -199,10 +195,6 @@ ATOMIC_OPS(andnot, &= ~, bic) > ATOMIC_OPS(or, |=, or) > ATOMIC_OPS(xor, ^=, xor) > > -#undef SCOND_FAIL_RETRY_VAR_DEF > -#undef SCOND_FAIL_RETRY_ASM > -#undef SCOND_FAIL_RETRY_VARS > - > #else /* CONFIG_ARC_PLAT_EZNPS */ > > static inline int atomic_read(const atomic_t *v) > > _______________________________________________ > linux-snps-arc mailing list > linux-snps-arc@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-snps-arc >