diff --git a/arch/x86/kernel/cpu/topology_common.c b/arch/x86/kernel/cpu/topology_common.c
index 9a6069e7133c9c1bee1f05e50b271888224c8093..0da37096cde5a5fbed2815067f91f7f8ddcd6d83 100644
--- a/arch/x86/kernel/cpu/topology_common.c
+++ b/arch/x86/kernel/cpu/topology_common.c
@@ -126,8 +126,12 @@ static void parse_topology(struct topo_scan *tscan, bool early)
 			cpu_parse_topology_amd(tscan);
 		break;
 	case X86_VENDOR_CENTAUR:
+		if (!IS_ENABLED(CONFIG_CPU_SUP_CENTAUR) || !cpu_parse_topology_ext(tscan))
+			parse_legacy(tscan);
+		break;
 	case X86_VENDOR_ZHAOXIN:
-		parse_legacy(tscan);
+		if (!IS_ENABLED(CONFIG_CPU_SUP_ZHAOXIN) || !cpu_parse_topology_ext(tscan))
+			parse_legacy(tscan);
 		break;
 	case X86_VENDOR_INTEL:
 		if (!IS_ENABLED(CONFIG_CPU_SUP_INTEL) || !cpu_parse_topology_ext(tscan))