[Xen-devel] [PATCH 6/6] xen/arm: SMP: Move out of the init section the code to bring up a CPU

[Julien Grall <julien.grall@xxxxxxxxxx>]

When CPU hotplug will be supported, it will require to bring up a CPU.

Signed-off-by: Julien Grall <julien.grall@xxxxxxxxxx>

---

I'm not sure if we should flag these functions with __cpuinit. The
define doesn't do anything.
---
 xen/arch/arm/arm32/smpboot.c | 4 ++--
 xen/arch/arm/platform.c      | 2 +-
 xen/arch/arm/smpboot.c       | 2 +-
 xen/include/asm-arm/smp.h    | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/xen/arch/arm/arm32/smpboot.c b/xen/arch/arm/arm32/smpboot.c
index 2a77f29..226d6fd 100644
--- a/xen/arch/arm/arm32/smpboot.c
+++ b/xen/arch/arm/arm32/smpboot.c
@@ -8,7 +8,7 @@ int __init arch_smp_init(void)
     return platform_smp_init();
 }
 
-int __init arch_cpu_init(int cpu, struct dt_device_node *dn)
+int arch_cpu_init(int cpu, struct dt_device_node *dn)
 {
     /* Not needed on ARM32, as there is no relevant information in
      * the CPU device tree node for ARMv7 CPUs.
@@ -16,7 +16,7 @@ int __init arch_cpu_init(int cpu, struct dt_device_node *dn)
     return 0;
 }
 
-int __init arch_cpu_up(int cpu)
+int arch_cpu_up(int cpu)
 {
     return platform_cpu_up(cpu);
 }
diff --git a/xen/arch/arm/platform.c b/xen/arch/arm/platform.c
index cb4cda8..0368679 100644
--- a/xen/arch/arm/platform.c
+++ b/xen/arch/arm/platform.c
@@ -108,7 +108,7 @@ int __init platform_specific_mapping(struct domain *d)
 }
 
 #ifdef CONFIG_ARM_32
-int __init platform_cpu_up(int cpu)
+int platform_cpu_up(int cpu)
 {
     if ( psci_ver )
         return call_psci_cpu_on(cpu);
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index a96cda2..a228623 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -343,7 +343,7 @@ void stop_cpu(void)
         wfi();
 }
 
-int __init cpu_up_send_sgi(int cpu)
+int cpu_up_send_sgi(int cpu)
 {
     /* We don't know the GIC ID of the CPU until it has woken up, so just
      * signal everyone and rely on our own smp_up_cpu gate to ensure only
diff --git a/xen/include/asm-arm/smp.h b/xen/include/asm-arm/smp.h
index 91b1e52..181aead 100644
--- a/xen/include/asm-arm/smp.h
+++ b/xen/include/asm-arm/smp.h
@@ -17,7 +17,7 @@ DECLARE_PER_CPU(cpumask_var_t, cpu_core_mask);
 
 extern void noreturn stop_cpu(void);
 
-extern int arch_smp_init(void);
+extern int __init arch_smp_init(void);
 extern int arch_cpu_init(int cpu, struct dt_device_node *dn);
 extern int arch_cpu_up(int cpu);
 
-- 
2.1.4


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel