From: Scott Weaver <scweaver@xxxxxxxxxx>
arch/x86/kernel/setup.c: fixup rh_check_supported
With 8078f4d6102f9 ('x86/cpu/topology: Rename smp_num_siblings') and
89b0f15f408f7 ('x86/cpu/topology: Get rid of cpuinfo::x86_max_cores')
the RHEL only rh_check_supported() needs updated to also replaced
boot_cpu_data.x86_max_cores and smp_num_siblings.
Signed-off-by: Scott Weaver <scweaver@xxxxxxxxxx>
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
index blahblah..blahblah 100644
--- a/arch/x86/kernel/setup.c
+++ b/arch/x86/kernel/setup.c
@@ -679,7 +679,7 @@ static void rh_check_supported(void)
guest = (x86_hyper_type != X86_HYPER_NATIVE || boot_cpu_has(X86_FEATURE_HYPERVISOR));
/* RHEL supports single cpu on guests only */
- if (((boot_cpu_data.x86_max_cores * smp_num_siblings) == 1) &&
+ if (((topology_num_threads_per_package() * __max_threads_per_core) == 1) &&
!guest && is_kdump_kernel()) {
pr_crit("Detected single cpu native boot.\n");
pr_crit("Important: In this kernel, single threaded, single CPU 64-bit physical systems are unsupported.");
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2979
--
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
