The branch main has been updated by imp:
URL:
https://cgit.FreeBSD.org/src/commit/?id=d27d543c78452b66f6324870e4a49e7285b049dd
commit d27d543c78452b66f6324870e4a49e7285b049dd
Author: Elliott Mitchell <ehem+free...@m5p.com>
AuthorDate: 2022-06-23 00:53:47 +0000
Commit: Warner Losh <i...@freebsd.org>
CommitDate: 2023-02-04 16:13:10 +0000
vmm: purge EOL release compatibility
Remove FreeBSD 11 support
Reviewed by: imp
Pull Request: https://github.com/freebsd/freebsd-src/pull/603
Differential Revision: https://reviews.freebsd.org/D35560
---
sys/amd64/vmm/x86.c | 10 ----------
1 file changed, 10 deletions(-)
diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c
index d99fb391afba..2d1b2385d1e8 100644
--- a/sys/amd64/vmm/x86.c
+++ b/sys/amd64/vmm/x86.c
@@ -61,16 +61,6 @@ static uint64_t bhyve_xcpuids;
SYSCTL_ULONG(_hw_vmm, OID_AUTO, bhyve_xcpuids, CTLFLAG_RW, &bhyve_xcpuids, 0,
"Number of times an unknown cpuid leaf was accessed");
-#if __FreeBSD_version < 1200060 /* Remove after 11 EOL helps MFCing */
-extern u_int threads_per_core;
-SYSCTL_UINT(_hw_vmm_topology, OID_AUTO, threads_per_core, CTLFLAG_RDTUN,
- &threads_per_core, 0, NULL);
-
-extern u_int cores_per_package;
-SYSCTL_UINT(_hw_vmm_topology, OID_AUTO, cores_per_package, CTLFLAG_RDTUN,
- &cores_per_package, 0, NULL);
-#endif
-
static int cpuid_leaf_b = 1;
SYSCTL_INT(_hw_vmm_topology, OID_AUTO, cpuid_leaf_b, CTLFLAG_RDTUN,
&cpuid_leaf_b, 0, NULL);
