[v1] smp: Mark smp_prepare_boot_cpu() __init

[PATCH] smp: Mark smp_prepare_boot_cpu() __init

Posted by Bibo Mao 1 year, 5 months ago

Function smp_prepare_boot_cpu() is only called at boot stage, here
mark it as __init.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
---
 arch/loongarch/kernel/smp.c | 2 +-
 arch/mips/kernel/smp.c      | 2 +-
 arch/powerpc/kernel/smp.c   | 2 +-
 include/linux/smp.h         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c
index ca405ab86aae..be2655c4c414 100644
--- a/arch/loongarch/kernel/smp.c
+++ b/arch/loongarch/kernel/smp.c
@@ -476,7 +476,7 @@ core_initcall(ipi_pm_init);
 #endif
 
 /* Preload SMP state for boot cpu */
-void smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
 	unsigned int cpu, node, rr_node;
 
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 0362fc5df7b0..39e193cad2b9 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -439,7 +439,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 }
 
 /* preload SMP state for boot cpu */
-void smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
 	if (mp_ops->prepare_boot_cpu)
 		mp_ops->prepare_boot_cpu();
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 46e6d2cd7a2d..4ab9b8cee77a 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1166,7 +1166,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	cpu_smt_set_num_threads(num_threads, threads_per_core);
 }
 
-void smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
 	BUG_ON(smp_processor_id() != boot_cpuid);
 #ifdef CONFIG_PPC64
diff --git a/include/linux/smp.h b/include/linux/smp.h
index fcd61dfe2af3..6a0813c905d0 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -109,7 +109,7 @@ static inline void on_each_cpu_cond(smp_cond_func_t cond_func,
  * Architecture specific boot CPU setup.  Defined as empty weak function in
  * init/main.c. Architectures can override it.
  */
-void smp_prepare_boot_cpu(void);
+void __init smp_prepare_boot_cpu(void);
 
 #ifdef CONFIG_SMP
 

base-commit: b31c4492884252a8360f312a0ac2049349ddf603
-- 
2.39.3

Re: [PATCH] smp: Mark smp_prepare_boot_cpu() __init

Posted by Huacai Chen 1 year, 5 months ago

Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>

On Sat, Sep 7, 2024 at 4:27 PM Bibo Mao <maobibo@loongson.cn> wrote:
>
> Function smp_prepare_boot_cpu() is only called at boot stage, here
> mark it as __init.
>
> Signed-off-by: Bibo Mao <maobibo@loongson.cn>
> ---
>  arch/loongarch/kernel/smp.c | 2 +-
>  arch/mips/kernel/smp.c      | 2 +-
>  arch/powerpc/kernel/smp.c   | 2 +-
>  include/linux/smp.h         | 2 +-
>  4 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c
> index ca405ab86aae..be2655c4c414 100644
> --- a/arch/loongarch/kernel/smp.c
> +++ b/arch/loongarch/kernel/smp.c
> @@ -476,7 +476,7 @@ core_initcall(ipi_pm_init);
>  #endif
>
>  /* Preload SMP state for boot cpu */
> -void smp_prepare_boot_cpu(void)
> +void __init smp_prepare_boot_cpu(void)
>  {
>         unsigned int cpu, node, rr_node;
>
> diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
> index 0362fc5df7b0..39e193cad2b9 100644
> --- a/arch/mips/kernel/smp.c
> +++ b/arch/mips/kernel/smp.c
> @@ -439,7 +439,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
>  }
>
>  /* preload SMP state for boot cpu */
> -void smp_prepare_boot_cpu(void)
> +void __init smp_prepare_boot_cpu(void)
>  {
>         if (mp_ops->prepare_boot_cpu)
>                 mp_ops->prepare_boot_cpu();
> diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
> index 46e6d2cd7a2d..4ab9b8cee77a 100644
> --- a/arch/powerpc/kernel/smp.c
> +++ b/arch/powerpc/kernel/smp.c
> @@ -1166,7 +1166,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
>         cpu_smt_set_num_threads(num_threads, threads_per_core);
>  }
>
> -void smp_prepare_boot_cpu(void)
> +void __init smp_prepare_boot_cpu(void)
>  {
>         BUG_ON(smp_processor_id() != boot_cpuid);
>  #ifdef CONFIG_PPC64
> diff --git a/include/linux/smp.h b/include/linux/smp.h
> index fcd61dfe2af3..6a0813c905d0 100644
> --- a/include/linux/smp.h
> +++ b/include/linux/smp.h
> @@ -109,7 +109,7 @@ static inline void on_each_cpu_cond(smp_cond_func_t cond_func,
>   * Architecture specific boot CPU setup.  Defined as empty weak function in
>   * init/main.c. Architectures can override it.
>   */
> -void smp_prepare_boot_cpu(void);
> +void __init smp_prepare_boot_cpu(void);
>
>  #ifdef CONFIG_SMP
>
>
> base-commit: b31c4492884252a8360f312a0ac2049349ddf603
> --
> 2.39.3
>

[tip: smp/core] smp: Mark smp_prepare_boot_cpu() __init

Posted by tip-bot2 for Bibo Mao 1 year, 5 months ago

The following commit has been merged into the smp/core branch of tip:

Commit-ID:     1d07085402d122f223bda3f8b72bea37a46ee0c9
Gitweb:        https://git.kernel.org/tip/1d07085402d122f223bda3f8b72bea37a46ee0c9
Author:        Bibo Mao <maobibo@loongson.cn>
AuthorDate:    Sat, 07 Sep 2024 16:27:20 +08:00
Committer:     Thomas Gleixner <tglx@linutronix.de>
CommitterDate: Sun, 08 Sep 2024 16:01:10 +02:00

smp: Mark smp_prepare_boot_cpu() __init

smp_prepare_boot_cpu() is only called during boot, hence mark it as
__init.

Signed-off-by: Bibo Mao <maobibo@loongson.cn>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Reviewed-by: Huacai Chen <chenhuacai@loongson.cn>
Link: https://lore.kernel.org/all/20240907082720.452148-1-maobibo@loongson.cn
---
 arch/loongarch/kernel/smp.c | 2 +-
 arch/mips/kernel/smp.c      | 2 +-
 arch/powerpc/kernel/smp.c   | 2 +-
 include/linux/smp.h         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/loongarch/kernel/smp.c b/arch/loongarch/kernel/smp.c
index ca405ab..be2655c 100644
--- a/arch/loongarch/kernel/smp.c
+++ b/arch/loongarch/kernel/smp.c
@@ -476,7 +476,7 @@ core_initcall(ipi_pm_init);
 #endif
 
 /* Preload SMP state for boot cpu */
-void smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
 	unsigned int cpu, node, rr_node;
 
diff --git a/arch/mips/kernel/smp.c b/arch/mips/kernel/smp.c
index 0362fc5..39e193c 100644
--- a/arch/mips/kernel/smp.c
+++ b/arch/mips/kernel/smp.c
@@ -439,7 +439,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 }
 
 /* preload SMP state for boot cpu */
-void smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
 	if (mp_ops->prepare_boot_cpu)
 		mp_ops->prepare_boot_cpu();
diff --git a/arch/powerpc/kernel/smp.c b/arch/powerpc/kernel/smp.c
index 46e6d2c..4ab9b8c 100644
--- a/arch/powerpc/kernel/smp.c
+++ b/arch/powerpc/kernel/smp.c
@@ -1166,7 +1166,7 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	cpu_smt_set_num_threads(num_threads, threads_per_core);
 }
 
-void smp_prepare_boot_cpu(void)
+void __init smp_prepare_boot_cpu(void)
 {
 	BUG_ON(smp_processor_id() != boot_cpuid);
 #ifdef CONFIG_PPC64
diff --git a/include/linux/smp.h b/include/linux/smp.h
index fcd61df..6a0813c 100644
--- a/include/linux/smp.h
+++ b/include/linux/smp.h
@@ -109,7 +109,7 @@ static inline void on_each_cpu_cond(smp_cond_func_t cond_func,
  * Architecture specific boot CPU setup.  Defined as empty weak function in
  * init/main.c. Architectures can override it.
  */
-void smp_prepare_boot_cpu(void);
+void __init smp_prepare_boot_cpu(void);
 
 #ifdef CONFIG_SMP