[PATCH 00/11] Delete new __cpuinit users and then delete stubs

[PATCH 00/11] Delete new __cpuinit users and then delete stubs

[Paul Gortmaker]

We removed the __cpuinit stuff in 3.11-rc1 with commit 
22f0a27367742f65130c0fb25ef00f7297e032c1 ("init.h: remove __cpuinit
sections from the kernel") but we left some no-op stubs as
a courtesy to unmerged code.

Here we get rid of the stubs as well, since (as can be seen in these
changes) they are enabling use cases to sneak back in, primarily from
older BSP code that has been living out of tree for some time prior
to getting mainlined.  So we get rid of these "new" users 1st and
then get rid of the stubs.

Obviously, getting rid of the stubs can't happen until all the users
are gone, so this might as well stay together as a series.  I'll feed
it into linux-next once I've sent out some other pending cleanups that
need to get coverage there as well.

Paul.

---

Cc: linux-arm-kernel at lists.infradead.org
Cc: linux-mips at linux-mips.org

Paul Gortmaker (11):
  sched/core: remove __cpuinit section tag that crept back in.
  arm/mach-keystone: remove legacy __cpuinit sections that crept in
  arm/mach-mvebu: remove legacy __cpuinit sections that crept in
  arm/mach-rockchip: remove legacy __cpuinit section that crept in
  arm/mach-hisi: remove legacy __CPUINIT section that crept in
  mips/ath25: remove legacy __cpuinit section that crept in
  mips/bcm77xx: remove legacy __cpuinit sections that crept in
  mips/c-r4k: remove legacy __cpuinit section that crept in
  kernel/cpu.c: remove new instance of __cpuinit that crept back in
  mips/mm/tlbex: remove new instance of __cpuinit that crept back in
  init: delete the __cpuinit related stubs

 arch/arm/mach-hisi/headsmp.S       |  3 ---
 arch/arm/mach-keystone/platsmp.c   |  4 ++--
 arch/arm/mach-mvebu/headsmp-a9.S   |  3 ---
 arch/arm/mach-mvebu/platsmp-a9.c   |  2 +-
 arch/arm/mach-rockchip/platsmp.c   |  3 +--
 arch/mips/ath25/board.c            |  2 +-
 arch/mips/bcm47xx/prom.c           |  2 +-
 arch/mips/include/asm/pgtable-32.h |  2 +-
 arch/mips/mm/c-r4k.c               |  2 +-
 arch/mips/mm/tlb-r4k.c             |  2 +-
 arch/mips/mm/tlbex.c               |  2 +-
 include/linux/init.h               | 11 -----------
 kernel/cpu.c                       |  2 +-
 kernel/sched/core.c                |  2 +-
 scripts/tags.sh                    |  2 +-
 15 files changed, 13 insertions(+), 31 deletions(-)

-- 
2.2.1

[PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in

[Paul Gortmaker]

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 at 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

[PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in

[Russell King - ARM Linux]

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 at 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 at 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.

[PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in

[Paul Gortmaker]

[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 at 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 at 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.

[PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in

[santosh shilimkar]

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 at 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

[PATCH 02/11] arm/mach-keystone: remove legacy __cpuinit sections that crept in

[Paul Gortmaker]

[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 at 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

[PATCH 03/11] arm/mach-mvebu: remove legacy __cpuinit sections that crept in

[Paul Gortmaker]

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.

Cc: Gregory CLEMENT <gregory.clement@free-electrons.com>
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 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 <linux/linkage.h>
-#include <linux/init.h>
 
 #include <asm/assembler.h>
 
-	__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;
-- 
2.2.1

[PATCH 03/11] arm/mach-mvebu: remove legacy __cpuinit sections that crept in

[Gregory CLEMENT]

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 <gregory.clement@free-electrons.com>

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 <gregory.clement@free-electrons.com>
> Cc: linux-arm-kernel at lists.infradead.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> ---
>  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 <linux/linkage.h>
> -#include <linux/init.h>
>  
>  #include <asm/assembler.h>
>  
> -	__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

[PATCH 04/11] arm/mach-rockchip: remove legacy __cpuinit section that crept in

[Paul Gortmaker]

We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However this one crept back in as of commit a7a2b3118b410fb3cd3a8363b1
("ARM: rockchip: add smp bringup code").

Since we want to clobber the stubs soon, get this removed now.

Cc: Heiko Stuebner <heiko@sntech.de>
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/arm/mach-rockchip/platsmp.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/arch/arm/mach-rockchip/platsmp.c b/arch/arm/mach-rockchip/platsmp.c
index 5b4ca3c3c879..fd2f0dc81015 100644
--- a/arch/arm/mach-rockchip/platsmp.c
+++ b/arch/arm/mach-rockchip/platsmp.c
@@ -119,8 +119,7 @@ static int pmu_set_power_domain(int pd, bool on)
  * Handling of CPU cores
  */
 
-static int __cpuinit rockchip_boot_secondary(unsigned int cpu,
-					     struct task_struct *idle)
+static int rockchip_boot_secondary(unsigned int cpu, struct task_struct *idle)
 {
 	int ret;
 
-- 
2.2.1

[PATCH 05/11] arm/mach-hisi: remove legacy __CPUINIT section that crept in

[Paul Gortmaker]

We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However a new instance was added in commit 06cc5c1d4d7313bc864e9aac1d1cbd
("ARM: hisi: enable hix5hd2 SoC")

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, but in this case it appears that this
single function file was never paired off with one.

Cc: Haifeng Yan <yanhaifeng@gmail.com>
Cc: linux-arm-kernel at lists.infradead.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/arm/mach-hisi/headsmp.S | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/arch/arm/mach-hisi/headsmp.S b/arch/arm/mach-hisi/headsmp.S
index 81e35b159e75..477da3966380 100644
--- a/arch/arm/mach-hisi/headsmp.S
+++ b/arch/arm/mach-hisi/headsmp.S
@@ -7,9 +7,6 @@
  * published by the Free Software Foundation.
  */
 #include <linux/linkage.h>
-#include <linux/init.h>
-
-	__CPUINIT
 
 ENTRY(hisi_secondary_startup)
 	bl	v7_invalidate_l1
-- 
2.2.1