Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757217Ab3D2Ju1 (ORCPT ); Mon, 29 Apr 2013 05:50:27 -0400 Received: from smtp.citrix.com ([66.165.176.89]:29308 "EHLO SMTP.CITRIX.COM" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753523Ab3D2JuZ (ORCPT ); Mon, 29 Apr 2013 05:50:25 -0400 X-IronPort-AV: E=Sophos;i="4.87,572,1363132800"; d="scan'208";a="22085968" Date: Mon, 29 Apr 2013 10:50:22 +0100 From: Stefano Stabellini X-X-Sender: sstabellini@kaball.uk.xensource.com To: Catalin Marinas CC: Stephen Rothwell , Olof Johansson , Arnd Bergmann , "linux-arm-kernel@lists.infradead.org" , "linux-next@vger.kernel.org" , "linux-kernel@vger.kernel.org" , Stefano Stabellini Subject: Re: linux-next: manual merge of the arm-soc tree with the xen-arm tree In-Reply-To: <20130429082511.GA539@arm.com> Message-ID: References: <20130429175426.9423279609437a2d746cbb7b@canb.auug.org.au> <20130429082511.GA539@arm.com> User-Agent: Alpine 2.02 (DEB 1266 2009-07-14) MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2220 Lines: 66 On Mon, 29 Apr 2013, Catalin Marinas wrote: > Stephen, > > On Mon, Apr 29, 2013 at 08:54:26AM +0100, Stephen Rothwell wrote: > > Today's linux-next merge of the arm-soc tree got a conflict in > > arch/arm/mach-virt/platsmp.c between commit fe4bff02886b ("arm: introduce > > psci_smp_ops") from the xen-arm tree and commit c0114709ed85 ("irqchip: > > gic: Perform the gic_secondary_init() call via CPU notifier") from the > > arm-soc tree. > > > > The former renamed the file (and contents) so I applied the following > > patch and can carry the fix as necessary (no action is required). > > > > From: Stephen Rothwell > > Date: Mon, 29 Apr 2013 17:52:27 +1000 > > Subject: [PATCH] arm: fix for Perform the gic_secondary_init() call via CPU > > notifier > > > > due to code movement. > > > > Signed-off-by: Stephen Rothwell > > --- > > arch/arm/kernel/psci_smp.c | 7 ------- > > 1 file changed, 7 deletions(-) > > > > diff --git a/arch/arm/kernel/psci_smp.c b/arch/arm/kernel/psci_smp.c > > index 6ef139d..cd9acc7 100644 > > --- a/arch/arm/kernel/psci_smp.c > > +++ b/arch/arm/kernel/psci_smp.c > > @@ -14,7 +14,6 @@ > > */ > > > > #include > > -#include > > #include > > #include > > > > @@ -55,11 +54,6 @@ static int __cpuinit psci_boot_secondary(unsigned int cpu, > > return -ENODEV; > > } > > > > -static void __cpuinit psci_secondary_init(unsigned int cpu) > > -{ > > - gic_secondary_init(0); > > -} > > - > > #ifdef CONFIG_HOTPLUG_CPU > > void __ref psci_cpu_die(unsigned int cpu) > > { > > @@ -84,7 +78,6 @@ bool __init psci_smp_available(void) > > } > > > > struct smp_operations __initdata psci_smp_ops = { > > - .smp_secondary_init = psci_secondary_init, > > .smp_boot_secondary = psci_boot_secondary, > > .cpu_die = psci_cpu_die, > > }; > > The fix looks fine. Thanks. Indeed, thanks! I'll add to it to the tree. -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/