From patchwork Mon Apr 29 07:54:26 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Rothwell X-Patchwork-Id: 2498801 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork2.kernel.org (Postfix) with ESMTP id E50B3DF25A for ; Mon, 29 Apr 2013 08:11:55 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UWivk-0003DB-Pj; Mon, 29 Apr 2013 07:55:25 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UWiv3-00043b-Uw; Mon, 29 Apr 2013 07:54:41 +0000 Received: from ozlabs.org ([2402:b800:7003:1:1::1]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UWiuy-000430-TE for linux-arm-kernel@lists.infradead.org; Mon, 29 Apr 2013 07:54:38 +0000 Received: from canb.auug.org.au (ibmaus65.lnk.telstra.net [165.228.126.9]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPSA id DA35F2C00BF; Mon, 29 Apr 2013 17:54:33 +1000 (EST) Date: Mon, 29 Apr 2013 17:54:26 +1000 From: Stephen Rothwell To: Olof Johansson , Arnd Bergmann , Subject: linux-next: manual merge of the arm-soc tree with the xen-arm tree Message-Id: <20130429175426.9423279609437a2d746cbb7b@canb.auug.org.au> X-Mailer: Sylpheed 3.3.0 (GTK+ 2.24.10; i486-pc-linux-gnu) Mime-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130429_035437_429129_7B6FE842 X-CRM114-Status: GOOD ( 23.54 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Catalin Marinas , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Stefano Stabellini X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Hi all, 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, };