| Message ID | 1430174880-27958-3-git-send-email-paul.gortmaker@windriver.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Apr 27, 2015 at 06:47:51PM -0400, Paul Gortmaker wrote: > We removed __cpuinit support (leaving no-op stubs) quite some time > ago. However two crept back in as of commit 5eb3da7246a5b2dfac9f38 > ("ARM: keystone: Switch over to coherent memory address space") > > Since we want to clobber the stubs too, get these removed now. > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Santosh's email is now: Santosh Shilimkar <ssantosh@kernel.org> > Cc: linux-arm-kernel@lists.infradead.org > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > --- > arch/arm/mach-keystone/platsmp.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c > index 5f46a7cf907b..7f99550cad46 100644 > --- a/arch/arm/mach-keystone/platsmp.c > +++ b/arch/arm/mach-keystone/platsmp.c > @@ -40,14 +40,14 @@ static int keystone_smp_boot_secondary(unsigned int cpu, > } > > #ifdef CONFIG_ARM_LPAE > -static void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) > +static void keystone_smp_secondary_initmem(unsigned int cpu) > { > pgd_t *pgd0 = pgd_offset_k(0); > cpu_set_ttbr(1, __pa(pgd0) + TTBR1_OFFSET); > local_flush_tlb_all(); > } > #else > -static inline void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) > +static inline void keystone_smp_secondary_initmem(unsigned int cpu) > {} > #endif > > -- > 2.2.1 > > > _______________________________________________ > linux-arm-kernel mailing list > linux-arm-kernel@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
[Re: [PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in] On 06/05/2015 (Wed 11:37) Russell King - ARM Linux wrote: > On Mon, Apr 27, 2015 at 06:47:51PM -0400, Paul Gortmaker wrote: > > We removed __cpuinit support (leaving no-op stubs) quite some time > > ago. However two crept back in as of commit 5eb3da7246a5b2dfac9f38 > > ("ARM: keystone: Switch over to coherent memory address space") > > > > Since we want to clobber the stubs too, get these removed now. > > > > Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Santosh's email is now: Santosh Shilimkar <ssantosh@kernel.org> Thanks - will fix locally and ensure that is what goes into linux-next etc. but won't bother respamming everyone with the whole series for it. P. -- > > > Cc: linux-arm-kernel@lists.infradead.org > > Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > > --- > > arch/arm/mach-keystone/platsmp.c | 4 ++-- > > 1 file changed, 2 insertions(+), 2 deletions(-) > > > > diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c > > index 5f46a7cf907b..7f99550cad46 100644 > > --- a/arch/arm/mach-keystone/platsmp.c > > +++ b/arch/arm/mach-keystone/platsmp.c > > @@ -40,14 +40,14 @@ static int keystone_smp_boot_secondary(unsigned int cpu, > > } > > > > #ifdef CONFIG_ARM_LPAE > > -static void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) > > +static void keystone_smp_secondary_initmem(unsigned int cpu) > > { > > pgd_t *pgd0 = pgd_offset_k(0); > > cpu_set_ttbr(1, __pa(pgd0) + TTBR1_OFFSET); > > local_flush_tlb_all(); > > } > > #else > > -static inline void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) > > +static inline void keystone_smp_secondary_initmem(unsigned int cpu) > > {} > > #endif > > > > -- > > 2.2.1 > > > > > > _______________________________________________ > > linux-arm-kernel mailing list > > linux-arm-kernel@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-arm-kernel > > -- > FTTC broadband for 0.8mile line: currently at 10.5Mbps down 400kbps up > according to speedtest.net.
On 5/6/2015 3:37 AM, Russell King - ARM Linux wrote: > On Mon, Apr 27, 2015 at 06:47:51PM -0400, Paul Gortmaker wrote: >> We removed __cpuinit support (leaving no-op stubs) quite some time >> ago. However two crept back in as of commit 5eb3da7246a5b2dfac9f38 >> ("ARM: keystone: Switch over to coherent memory address space") >> >> Since we want to clobber the stubs too, get these removed now. >> >> Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > > Santosh's email is now: Santosh Shilimkar <ssantosh@kernel.org> > Thanks Russell. >> Cc: linux-arm-kernel@lists.infradead.org >> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> >> --- >> arch/arm/mach-keystone/platsmp.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> Paul, Change is fine by me. I can pick this up for 4.2 Regards, Santosh
[Re: [PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in] On 06/05/2015 (Wed 10:10) santosh shilimkar wrote: > On 5/6/2015 3:37 AM, Russell King - ARM Linux wrote: > >On Mon, Apr 27, 2015 at 06:47:51PM -0400, Paul Gortmaker wrote: > >>We removed __cpuinit support (leaving no-op stubs) quite some time > >>ago. However two crept back in as of commit 5eb3da7246a5b2dfac9f38 > >>("ARM: keystone: Switch over to coherent memory address space") > >> > >>Since we want to clobber the stubs too, get these removed now. > >> > >>Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> > > > >Santosh's email is now: Santosh Shilimkar <ssantosh@kernel.org> > > > Thanks Russell. > > > >>Cc: linux-arm-kernel@lists.infradead.org > >>Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> > >>--- > >> arch/arm/mach-keystone/platsmp.c | 4 ++-- > >> 1 file changed, 2 insertions(+), 2 deletions(-) > >> > Paul, Change is fine by me. I can pick this up for 4.2 No need, since I'm forced to keep it here with the actual final stub removal so that I don't break bisection for people once it goes to Linus eventually. I'll add an Ack'd by though. Thanks, Paul. -- > > Regards, > Santosh
diff --git a/arch/arm/mach-keystone/platsmp.c b/arch/arm/mach-keystone/platsmp.c index 5f46a7cf907b..7f99550cad46 100644 --- a/arch/arm/mach-keystone/platsmp.c +++ b/arch/arm/mach-keystone/platsmp.c @@ -40,14 +40,14 @@ static int keystone_smp_boot_secondary(unsigned int cpu, } #ifdef CONFIG_ARM_LPAE -static void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) +static void keystone_smp_secondary_initmem(unsigned int cpu) { pgd_t *pgd0 = pgd_offset_k(0); cpu_set_ttbr(1, __pa(pgd0) + TTBR1_OFFSET); local_flush_tlb_all(); } #else -static inline void __cpuinit keystone_smp_secondary_initmem(unsigned int cpu) +static inline void keystone_smp_secondary_initmem(unsigned int cpu) {} #endif
We removed __cpuinit support (leaving no-op stubs) quite some time ago. However two crept back in as of commit 5eb3da7246a5b2dfac9f38 ("ARM: keystone: Switch over to coherent memory address space") Since we want to clobber the stubs too, get these removed now. Cc: Santosh Shilimkar <santosh.shilimkar@ti.com> Cc: linux-arm-kernel@lists.infradead.org Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> --- arch/arm/mach-keystone/platsmp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)