!821 Revert "riscv: topology: fix default topology reporting"

Merge Pull Request from: @zhangjialin11 
 
This reverts commit 932afc18.

Fix build error in riscv64:
build failed: riscv, allmodconfig

arch/riscv/kernel/smpboot.o: In function `smp_callin':
(.text+0x160): undefined reference to `store_cpu_topology'
arch/riscv/kernel/smpboot.o: In function `smp_prepare_cpus':
(.init.text+0x212): undefined reference to `store_cpu_topology'
make: *** [vmlinux] Error 1 
 
Link:https://gitee.com/openeuler/kernel/pulls/821 

Reviewed-by: Zheng Zengkai <zhengzengkai@huawei.com> 
Signed-off-by: Zheng Zengkai <zhengzengkai@huawei.com> 

arch/riscv/Kconfig

@@ -36,7 +36,7 @@ config RISCV
 	select CLINT_TIMER if !MMU
 	select COMMON_CLK
 	select EDAC_SUPPORT
-	select GENERIC_ARCH_TOPOLOGY
+	select GENERIC_ARCH_TOPOLOGY if SMP
 	select GENERIC_ATOMIC64 if !64BIT
 	select GENERIC_CLOCKEVENTS
 	select GENERIC_EARLY_IOREMAP

arch/riscv/kernel/smpboot.c

@@ -46,8 +46,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 	int cpuid;
 	int ret;
 
-	store_cpu_topology(smp_processor_id());
-
 	/* This covers non-smp usecase mandated by "nosmp" option */
 	if (max_cpus == 0)
 		return;
@@ -154,8 +152,8 @@ asmlinkage __visible void smp_callin(void)
 	mmgrab(mm);
 	current->active_mm = mm;
 
-	store_cpu_topology(curr_cpuid);
 	notify_cpu_starting(curr_cpuid);
+	update_siblings_masks(curr_cpuid);
 	set_cpu_online(curr_cpuid, 1);
 
 	/*