linux-kernel - Re: linux-next: manual merge of the arm-soc tree with the xen-arm tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite for Android: free password hash cracker in your pocket

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20130429082511.GA539@arm.com>
Date:	Mon, 29 Apr 2013 09:25:12 +0100
From:	Catalin Marinas <catalin.marinas@....com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
Cc:	Olof Johansson <olof@...om.net>, Arnd Bergmann <arnd@...db.de>,
	"linux-arm-kernel@...ts.infradead.org" 
	<linux-arm-kernel@...ts.infradead.org>,
	"linux-next@...r.kernel.org" <linux-next@...r.kernel.org>,
	"linux-kernel@...r.kernel.org" <linux-kernel@...r.kernel.org>,
	Stefano Stabellini <stefano.stabellini@...citrix.com>
Subject: Re: linux-next: manual merge of the arm-soc tree with the xen-arm
 tree

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@...b.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@...b.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/