From: Catalin Marinas <catalin.marinas@arm.com>
To: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Arnd Bergmann <arnd@arndb.de>,
Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"linux-next@vger.kernel.org" <linux-next@vger.kernel.org>,
Olof Johansson <olof@lixom.net>,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>
Subject: Re: linux-next: manual merge of the arm-soc tree with the xen-arm tree
Date: Mon, 29 Apr 2013 09:25:12 +0100 [thread overview]
Message-ID: <20130429082511.GA539@arm.com> (raw)
In-Reply-To: <20130429175426.9423279609437a2d746cbb7b@canb.auug.org.au>
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 <sfr@canb.auug.org.au>
> 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 <sfr@canb.auug.org.au>
> ---
> 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 <linux/init.h>
> -#include <linux/irqchip/arm-gic.h>
> #include <linux/smp.h>
> #include <linux/of.h>
>
> @@ -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.
--
Catalin
next prev parent reply other threads:[~2013-04-29 8:25 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-04-29 7:54 linux-next: manual merge of the arm-soc tree with the xen-arm tree Stephen Rothwell
2013-04-29 8:25 ` Catalin Marinas [this message]
2013-04-29 9:50 ` Stefano Stabellini
2013-04-29 23:18 ` Stephen Rothwell
2013-04-30 13:54 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130429082511.GA539@arm.com \
--to=catalin.marinas@arm.com \
--cc=arnd@arndb.de \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-next@vger.kernel.org \
--cc=olof@lixom.net \
--cc=sfr@canb.auug.org.au \
--cc=stefano.stabellini@eu.citrix.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).