From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH] xen/arm: correct duplicate MPIDR check to actually skip the node Date: Mon, 11 Nov 2013 19:54:18 +0000 Message-ID: <528135EA.8060603@linaro.org> References: <1383870723-9579-1-git-send-email-mattjd@gmail.com> <1384186202.19117.71.camel@kazak.uk.xensource.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii"; Format="flowed" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1VfxZ1-0002Ga-IY for xen-devel@lists.xenproject.org; Mon, 11 Nov 2013 19:54:23 +0000 Received: by mail-we0-f175.google.com with SMTP id p61so2418632wes.20 for ; Mon, 11 Nov 2013 11:54:21 -0800 (PST) In-Reply-To: <1384186202.19117.71.camel@kazak.uk.xensource.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Ian Campbell , Matthew Daley Cc: Julien Grall , xen-devel@lists.xenproject.org List-Id: xen-devel@lists.xenproject.org On 11/11/2013 04:10 PM, Ian Campbell wrote: > On Fri, 2013-11-08 at 13:32 +1300, Matthew Daley wrote: >> Signed-off-by: Matthew Daley >> --- >> I assume this was what was really intended... > Indeed, that for spotting this error ! > CCing Julien... But yes it looks like it. > >> xen/arch/arm/smpboot.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c >> index b836be4..6c90fa6 100644 >> --- a/xen/arch/arm/smpboot.c >> +++ b/xen/arch/arm/smpboot.c >> @@ -161,9 +161,11 @@ void __init smp_init_cpus(void) >> printk(XENLOG_WARNING >> "cpu node `%s`: duplicate /cpu reg properties in the DT\n", >> dt_node_full_name(cpu)); >> - continue; >> + break; >> } >> } >> + if ( j != cpuidx ) >> + continue; > > Took me a moment to figure out what this was for. I'm half minded to > suggest this is one of those places where a "goto next_cpu" would have > been ok, I'd definitely want a second opinion on that though! > I'm happy with the both solutions: Acked-by: Julien Grall -- Julien Grall