From: Hanjun Guo hanjun.guo@linaro.org
move topology_init() to where it belongs.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- arch/arm/kernel/setup.c | 15 --------------- arch/arm/kernel/topology.c | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 638f0a1..52c23ba 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -851,21 +851,6 @@ void __init setup_arch(char **cmdline_p) #endif }
- -static int __init topology_init(void) -{ - int cpu; - - for_each_possible_cpu(cpu) { - struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu); - cpuinfo->cpu.hotpluggable = 1; - register_cpu(&cpuinfo->cpu, cpu); - } - - return 0; -} -subsys_initcall(topology_init); - #ifdef CONFIG_HAVE_PROC_CPU static int __init proc_cpu_init(void) { diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c index 1cb4350..0444325 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -24,6 +24,7 @@
#include <asm/cputype.h> #include <asm/topology.h> +#include <asm/cpu.h>
/* * cpu power scale management @@ -324,3 +325,18 @@ void __init init_cpu_topology(void)
parse_dt_topology(); } + +static int __init topology_init(void) +{ + int cpu; + + for_each_possible_cpu(cpu) { + struct cpuinfo_arm *cpuinfo = &per_cpu(cpu_data, cpu); + cpuinfo->cpu.hotpluggable = 1; + register_cpu(&cpuinfo->cpu, cpu); + } + + return 0; +} +subsys_initcall(topology_init); +