Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966057AbbD1QGX (ORCPT ); Tue, 28 Apr 2015 12:06:23 -0400 Received: from down.free-electrons.com ([37.187.137.238]:58594 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1030220AbbD1QGV (ORCPT ); Tue, 28 Apr 2015 12:06:21 -0400 Message-ID: <553FAFF9.4030100@free-electrons.com> Date: Tue, 28 Apr 2015 18:06:17 +0200 From: Gregory CLEMENT User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.6.0 MIME-Version: 1.0 To: Paul Gortmaker , linux-kernel@vger.kernel.org CC: linux-arm-kernel@lists.infradead.org Subject: Re: [PATCH 03/11] arm/mach-mvebu: remove legacy __cpuinit sections that crept in References: <1430174880-27958-1-git-send-email-paul.gortmaker@windriver.com> <1430174880-27958-4-git-send-email-paul.gortmaker@windriver.com> In-Reply-To: <1430174880-27958-4-git-send-email-paul.gortmaker@windriver.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2685 Lines: 82 Hi Paul, On 28/04/2015 00:47, Paul Gortmaker wrote: > We removed __cpuinit support (leaving no-op stubs) quite some time > ago. However these ones crept back in as of commit 1ee89e2231a1b04dc3476 > ("ARM: mvebu: add SMP support for Armada 375 and Armada 38x") > > Since we want to clobber the stubs soon, get this removed now. > Note that there would normally be a corresponding removal of > a ".previous" directive for each __CPUINIT in asm files, but in > this case it appears that this single function file was never > paired off with one. > Of course you have my Acked-by: Gregory CLEMENT Usually the patch modifying these files should be merged through the mvebu subsystem. However, if your last patch is merged before this one we will lose the bisectability. As I don't expect any big changes in these 2 files for the next merge window, I don't think there will be a merge conflict, so you can push this patch along the last one to the appropriate git tree. Thanks, Gregory > Cc: Gregory CLEMENT > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Paul Gortmaker > --- > arch/arm/mach-mvebu/headsmp-a9.S | 3 --- > arch/arm/mach-mvebu/platsmp-a9.c | 2 +- > 2 files changed, 1 insertion(+), 4 deletions(-) > > diff --git a/arch/arm/mach-mvebu/headsmp-a9.S b/arch/arm/mach-mvebu/headsmp-a9.S > index 08d5ed46b996..f6a1b5b153af 100644 > --- a/arch/arm/mach-mvebu/headsmp-a9.S > +++ b/arch/arm/mach-mvebu/headsmp-a9.S > @@ -13,12 +13,9 @@ > */ > > #include > -#include > > #include > > - __CPUINIT > - > ENTRY(mvebu_cortex_a9_secondary_startup) > ARM_BE8(setend be) > bl v7_invalidate_l1 > diff --git a/arch/arm/mach-mvebu/platsmp-a9.c b/arch/arm/mach-mvebu/platsmp-a9.c > index df0a9cc5da59..3d5000481c11 100644 > --- a/arch/arm/mach-mvebu/platsmp-a9.c > +++ b/arch/arm/mach-mvebu/platsmp-a9.c > @@ -24,7 +24,7 @@ > > extern void mvebu_cortex_a9_secondary_startup(void); > > -static int __cpuinit mvebu_cortex_a9_boot_secondary(unsigned int cpu, > +static int mvebu_cortex_a9_boot_secondary(unsigned int cpu, > struct task_struct *idle) > { > int ret, hw_cpu; > -- Gregory Clement, Free Electrons Kernel, drivers, real-time and embedded Linux development, consulting, training and support. http://free-electrons.com -- 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/