diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index a63d8134a9e524b5137ed49aaa1fc1be7b7e3e96..e52cd2cefe8e781602942e5a9f09ae6ef486bc7b 100644
--- a/arch/riscv/Kconfig
+++ b/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
diff --git a/arch/riscv/kernel/smpboot.c b/arch/riscv/kernel/smpboot.c
index 0e0aed380e281b8fbc69c9ab1b9422d1baabb90c..0b04e0eae3ab5bfe0e9ff714e6ebef512b83dafd 100644
--- a/arch/riscv/kernel/smpboot.c
+++ b/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);
 
 	/*