move topology_init() to where it belongs to.
Signed-off-by: Hanjun Guo hanjun.guo@linaro.org --- arch/arm/kernel/setup.c | 21 --------------------- arch/arm/kernel/topology.c | 21 +++++++++++++++++++++ 2 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/arch/arm/kernel/setup.c b/arch/arm/kernel/setup.c index 7b3d3d3..b00bb7a 100644 --- a/arch/arm/kernel/setup.c +++ b/arch/arm/kernel/setup.c @@ -859,27 +859,6 @@ void __init setup_arch(char **cmdline_p) #endif }
- -static int __init topology_init(void) -{ - int cpu; - -#ifdef CONFIG_NUMA - int node; - for_each_online_node(node) - register_one_node(node); -#endif - - 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 d951ae2..dcc551f 100644 --- a/arch/arm/kernel/topology.c +++ b/arch/arm/kernel/topology.c @@ -25,6 +25,7 @@ #include <asm/cputype.h> #include <asm/smp_plat.h> #include <asm/topology.h> +#include <asm/cpu.h>
/* * cpu power scale management @@ -455,3 +456,23 @@ void __init init_cpu_topology(void)
parse_dt_topology(); } + +static int __init topology_init(void) +{ + int cpu; + +#ifdef CONFIG_NUMA + int node; + for_each_online_node(node) + register_one_node(node); +#endif + + 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);