[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@lists.infradead.org
Cc: linux-mips@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 01/11] sched/core: remove __cpuinit section tag that crept back in.

[Paul Gortmaker]

We removed __cpuinit support (leaving no-op stubs) quite some time
ago.  However this one crept back in as of commit a803f0261bb2bb57aab
("sched: Initialize rq->age_stamp on processor start")

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

Cc: Corey Minyard <cminyard@mvista.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index f9123a82cbb6..7709aaa5b2cf 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5330,7 +5330,7 @@ static struct notifier_block migration_notifier = {
 	.priority = CPU_PRI_MIGRATION,
 };
 
-static void __cpuinit set_cpu_rq_start_time(void)
+static void set_cpu_rq_start_time(void)
 {
 	int cpu = smp_processor_id();
 	struct rq *rq = cpu_rq(cpu);
-- 
2.2.1

[tip:sched/core] sched/core: Remove __cpuinit section tag that crept back in

[tip-bot for Paul Gortmaker]

Commit-ID:  6a82b60da26bc404a8fca242521d988c437d0611
Gitweb:     http://git.kernel.org/tip/6a82b60da26bc404a8fca242521d988c437d0611
Author:     Paul Gortmaker <paul.gortmaker@windriver.com>
AuthorDate: Mon, 27 Apr 2015 18:47:50 -0400
Committer:  Ingo Molnar <mingo@kernel.org>
CommitDate: Fri, 8 May 2015 11:54:43 +0200

sched/core: Remove __cpuinit section tag that crept back in

We removed __cpuinit support (leaving no-op stubs) quite some time
ago.  However this one crept back in as of commit a803f0261bb2bb57aab
("sched: Initialize rq->age_stamp on processor start")

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

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Corey Minyard <cminyard@mvista.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/1430174880-27958-2-git-send-email-paul.gortmaker@windriver.com
Signed-off-by: Ingo Molnar <mingo@kernel.org>
---
 kernel/sched/core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index fe22f75..43ba765 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -5315,7 +5315,7 @@ static struct notifier_block migration_notifier = {
 	.priority = CPU_PRI_MIGRATION,
 };
 
-static void __cpuinit set_cpu_rq_start_time(void)
+static void set_cpu_rq_start_time(void)
 {
 	int cpu = smp_processor_id();
 	struct rq *rq = cpu_rq(cpu);

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

Re: [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@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.

Re: [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@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.

Re: [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@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

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

Re: [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@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@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@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

[PATCH 06/11] mips/ath25: 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 43cc739fd98b8c517ad45756d869f
("MIPS: ath25: add common parts")

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

Cc: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/mips/ath25/board.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/ath25/board.c b/arch/mips/ath25/board.c
index b8bb78282d6a..9ab48ff80c1c 100644
--- a/arch/mips/ath25/board.c
+++ b/arch/mips/ath25/board.c
@@ -216,7 +216,7 @@ void __init plat_time_init(void)
 		ar2315_plat_time_init();
 }
 
-unsigned int __cpuinit get_c0_compare_int(void)
+unsigned int get_c0_compare_int(void)
 {
 	return CP0_LEGACY_COMPARE_IRQ;
 }
-- 
2.2.1

Re: [PATCH 06/11] mips/ath25: remove legacy __cpuinit section that crept in

[Sergey Ryazanov]

2015-04-28 1:47 GMT+03:00 Paul Gortmaker <paul.gortmaker@windriver.com>:
> We removed __cpuinit support (leaving no-op stubs) quite some time ago.
> However this one crept back in as of commit 43cc739fd98b8c517ad45756d869f
> ("MIPS: ath25: add common parts")
>
> Since we want to clobber the stubs soon, get this removed now.
>
> Cc: Sergey Ryazanov <ryazanov.s.a@gmail.com>
> Cc: linux-mips@linux-mips.org
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Looks like I missed that this macro is scheduled for removing.

Acked-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>

-- 
Sergey

[PATCH 07/11] mips/bcm77xx: remove legacy __cpuinit sections that crept in

[Paul Gortmaker]

We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However a few more crept in as of commit 6ee1d93455384cef8a0426effe85da2
("MIPS: BCM47XX: Detect more then 128 MiB of RAM (HIGHMEM)")

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

Cc: Rafał Miłecki <zajec5@gmail.com>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/mips/bcm47xx/prom.c           | 2 +-
 arch/mips/include/asm/pgtable-32.h | 2 +-
 arch/mips/mm/tlb-r4k.c             | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/mips/bcm47xx/prom.c b/arch/mips/bcm47xx/prom.c
index ab698bad6d62..135a5407f015 100644
--- a/arch/mips/bcm47xx/prom.c
+++ b/arch/mips/bcm47xx/prom.c
@@ -126,7 +126,7 @@ void __init prom_free_prom_memory(void)
 /* Stripped version of tlb_init, with the call to build_tlb_refill_handler
  * dropped. Calling it at this stage causes a hang.
  */
-void __cpuinit early_tlb_init(void)
+void early_tlb_init(void)
 {
 	write_c0_pagemask(PM_DEFAULT_MASK);
 	write_c0_wired(0);
diff --git a/arch/mips/include/asm/pgtable-32.h b/arch/mips/include/asm/pgtable-32.h
index 7d56686c0e62..832e2167d00f 100644
--- a/arch/mips/include/asm/pgtable-32.h
+++ b/arch/mips/include/asm/pgtable-32.h
@@ -18,7 +18,7 @@
 
 #include <asm-generic/pgtable-nopmd.h>
 
-extern int temp_tlb_entry __cpuinitdata;
+extern int temp_tlb_entry;
 
 /*
  * - add_temporary_entry() add a temporary TLB entry. We use TLB entries
diff --git a/arch/mips/mm/tlb-r4k.c b/arch/mips/mm/tlb-r4k.c
index a27a088e6f9f..440cbf3d6ab9 100644
--- a/arch/mips/mm/tlb-r4k.c
+++ b/arch/mips/mm/tlb-r4k.c
@@ -423,7 +423,7 @@ int __init has_transparent_hugepage(void)
  * lifetime of the system
  */
 
-int temp_tlb_entry __cpuinitdata;
+int temp_tlb_entry;
 
 __init int add_temporary_entry(unsigned long entrylo0, unsigned long entrylo1,
 			       unsigned long entryhi, unsigned long pagemask)
-- 
2.2.1

[PATCH 08/11] mips/c-r4k: 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 4caa906ee949b7002cc1558bbe3744
("MIPS: mm: c-r4k: Build EVA {d,i}cache flushing functions")

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

Cc: Leonid Yegoshin <Leonid.Yegoshin@imgtec.com>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/mips/mm/c-r4k.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 0dbb65a51ce5..c93070f7c253 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -295,7 +295,7 @@ static void r4k_blast_icache_page_setup(void)
 
 static void (*r4k_blast_icache_user_page)(unsigned long addr);
 
-static void __cpuinit r4k_blast_icache_user_page_setup(void)
+static void r4k_blast_icache_user_page_setup(void)
 {
 	unsigned long ic_lsize = cpu_icache_line_size();
 
-- 
2.2.1

[PATCH 09/11] kernel/cpu.c: remove new instance of __cpuinit that crept back in

[Paul Gortmaker]

We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However a new instance was added in commit 00df35f991914db6b8bde8cf0980
("cpu: Defer smpboot kthread unparking until CPU known to scheduler")

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

Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 kernel/cpu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/cpu.c b/kernel/cpu.c
index 94bbe4695232..b4e940d89087 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -479,7 +479,7 @@ static struct notifier_block smpboot_thread_notifier = {
 	.priority = CPU_PRI_SMPBOOT,
 };
 
-void __cpuinit smpboot_thread_init(void)
+void smpboot_thread_init(void)
 {
 	register_cpu_notifier(&smpboot_thread_notifier);
 }
-- 
2.2.1

Re: [PATCH 09/11] kernel/cpu.c: remove new instance of __cpuinit that crept back in

[Paul E. McKenney]

On Mon, Apr 27, 2015 at 06:47:58PM -0400, Paul Gortmaker wrote:
> We removed __cpuinit support (leaving no-op stubs) quite some time ago.
> However a new instance was added in commit 00df35f991914db6b8bde8cf0980
> ("cpu: Defer smpboot kthread unparking until CPU known to scheduler")
> 
> Since we want to clobber the stubs soon, get this removed now.
> 
> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>

Good catch, queued for 4.2.  Please let me know if you need it sooner.

							Thanx, Paul

> ---
>  kernel/cpu.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/kernel/cpu.c b/kernel/cpu.c
> index 94bbe4695232..b4e940d89087 100644
> --- a/kernel/cpu.c
> +++ b/kernel/cpu.c
> @@ -479,7 +479,7 @@ static struct notifier_block smpboot_thread_notifier = {
>  	.priority = CPU_PRI_SMPBOOT,
>  };
> 
> -void __cpuinit smpboot_thread_init(void)
> +void smpboot_thread_init(void)
>  {
>  	register_cpu_notifier(&smpboot_thread_notifier);
>  }
> -- 
> 2.2.1
> 

Re: [PATCH 09/11] kernel/cpu.c: remove new instance of __cpuinit that crept back in

[Paul Gortmaker]

On 15-04-28 09:12 AM, Paul E. McKenney wrote:
> On Mon, Apr 27, 2015 at 06:47:58PM -0400, Paul Gortmaker wrote:
>> We removed __cpuinit support (leaving no-op stubs) quite some time ago.
>> However a new instance was added in commit 00df35f991914db6b8bde8cf0980
>> ("cpu: Defer smpboot kthread unparking until CPU known to scheduler")
>>
>> Since we want to clobber the stubs soon, get this removed now.
>>
>> Cc: Paul E. McKenney <paulmck@linux.vnet.ibm.com>
>> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
> 
> Good catch, queued for 4.2.  Please let me know if you need it sooner.

No rush ; no need to queue it either, since I have to keep the
patch in this series in order to be able to remove the stubs in
the 11/11, since I don't want to guess what merge order will
happen in ~6 weeks.

Thanks,
Paul.
--

> 
> 							Thanx, Paul
> 
>> ---
>>  kernel/cpu.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/kernel/cpu.c b/kernel/cpu.c
>> index 94bbe4695232..b4e940d89087 100644
>> --- a/kernel/cpu.c
>> +++ b/kernel/cpu.c
>> @@ -479,7 +479,7 @@ static struct notifier_block smpboot_thread_notifier = {
>>  	.priority = CPU_PRI_SMPBOOT,
>>  };
>>
>> -void __cpuinit smpboot_thread_init(void)
>> +void smpboot_thread_init(void)
>>  {
>>  	register_cpu_notifier(&smpboot_thread_notifier);
>>  }
>> -- 
>> 2.2.1
>>
> 

[PATCH 10/11] mips/mm/tlbex: remove new instance of __cpuinit that crept back in

[Paul Gortmaker]

We removed __cpuinit support (leaving no-op stubs) quite some time ago.
However a new instance was added in commit c5b367835cfc7a8ef53b9670a409ff
("MIPS: Add support for XPA.")

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

Cc: Steven J. Hill <Steven.Hill@imgtec.com>
Cc: linux-mips@linux-mips.org
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 arch/mips/mm/tlbex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index 97c87027c17f..d7db82c3fbce 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -35,7 +35,7 @@
 #include <asm/uasm.h>
 #include <asm/setup.h>
 
-static int __cpuinitdata mips_xpa_disabled;
+static int mips_xpa_disabled;
 
 static int __init xpa_disable(char *s)
 {
-- 
2.2.1

[PATCH 11/11] init: delete the __cpuinit related stubs

[Paul Gortmaker]

The __cpuinit support was removed several releases ago in 3.11-rc1 with
commit 22f0a27367742f65130c0fb25ef00f7297e032c1 ("init.h: remove __cpuinit
sections from the kernel") 

People have had a chance to update their out of tree code, so now we remove
the no-op stubs to ensure no more new use cases can creep back in.

Also delete the mention of __cpuinitdata from the tag script.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---
 include/linux/init.h | 11 -----------
 scripts/tags.sh      |  2 +-
 2 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/include/linux/init.h b/include/linux/init.h
index 21b6d768edd7..7c68c36d3fd8 100644
--- a/include/linux/init.h
+++ b/include/linux/init.h
@@ -91,14 +91,6 @@
 
 #define __exit          __section(.exit.text) __exitused __cold notrace
 
-/* temporary, until all users are removed */
-#define __cpuinit
-#define __cpuinitdata
-#define __cpuinitconst
-#define __cpuexit
-#define __cpuexitdata
-#define __cpuexitconst
-
 /* Used for MEMORY_HOTPLUG */
 #define __meminit        __section(.meminit.text) __cold notrace
 #define __meminitdata    __section(.meminit.data)
@@ -116,9 +108,6 @@
 #define __INITRODATA	.section	".init.rodata","a",%progbits
 #define __FINITDATA	.previous
 
-/* temporary, until all users are removed */
-#define __CPUINIT
-
 #define __MEMINIT        .section	".meminit.text", "ax"
 #define __MEMINITDATA    .section	".meminit.data", "aw"
 #define __MEMINITRODATA  .section	".meminit.rodata", "a"
diff --git a/scripts/tags.sh b/scripts/tags.sh
index cdb491d84503..c0a932dff329 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -154,7 +154,7 @@ exuberant()
 {
 	all_target_sources | xargs $1 -a                        \
 	-I __initdata,__exitdata,__initconst,			\
-	-I __cpuinitdata,__initdata_memblock			\
+	-I __initdata_memblock					\
 	-I __refdata,__attribute,__maybe_unused,__always_unused \
 	-I __acquires,__releases,__deprecated			\
 	-I __read_mostly,__aligned,____cacheline_aligned        \
-- 
2.2.1