From nobody Sat Feb 04 16:20:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P8HnG1S8Cz3nZGG; Sat, 4 Feb 2023 16:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P8HnG0dBDz44g4; Sat, 4 Feb 2023 16:20:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Egx2/zf9gnFWj5RHLdrNWBDT852BSSMX2MVYmklayg8=; b=ZvmjyJgOYE88t9v4iPURs5eQ8m5JOS/4lRfJB7k38Mh0oT3WYcUOhK3YcVBVEvbmpOFxrh hMb3xHaCSnkkAJ1gf+51XWHnm53hFxwiBsVVHCCYtfOf6h/rg2Q6hI1oZPzaliEpWP+zyS zqsgqBlmbxiaScNOgHBhZ8mGKkuC+bU7vU0+bp/S5VqUrYTcOVM9go4Xr5OtjWQgIduGwW OrK2QKIxtKjYsJjo2WgvPLjOYji97mD9ekVhz7WoLaV0BNTcNUn5gwTEX3Awe56SXEk8+d XqossQJ7+GGtsb7uVGgrO2jTH5bNP4QbSHzCiT1xIVrj7Akx8SHHvAsPT6oq8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1675527634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Egx2/zf9gnFWj5RHLdrNWBDT852BSSMX2MVYmklayg8=; b=kaWhLh5GdhKKpNNAWu4ycVtHe+1i0bywUEtiJcJe99j4z8QvNe0g1FfmH7AjaPFlA2Ijbw wnHEN5EN4Ib3i2CYc3CnDcMpg0jW85+zKVkC2xAE9vJhcKFZGrQsRRxIMLvQxq89MBv4tB RT9+JL07ARq3rMgg09D7Hr8pl5xExUUU0GKJVl4gQML7gg9/Q7H89YgYSyGxcsVj5Gz/x5 QKIjjE1M9F6SS7gF2EeWxgWyPVywo5EmzhunI/PZ1SZ+mH1mT1z6zdb8pFmWK3oGLsxNn8 Q0GGuofjwEvs8gDempWpBMSuBnq1aXnSzvDV6s1n1chguL3DKpllloLPHfeL5g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1675527634; a=rsa-sha256; cv=none; b=C7/6cpmNdxpC96QscOSqXLu4C5dRjGxW+PbpR02tO7L0hwGWUjcwwoslK9DQ1hlzJvZZNG slE1Ie4ux0ANKCNlcpTcw+ZdTfbvbRGbyNd4N84EADdgIbbRaQsKnRASAECn+1h3yACR3H WeJfOmq6KFBPzosEqlGPKgSze9YmsPw4oyH7D/DhuB1C3XZtAp2L2ysNVGgR0k38Sfv6g0 wLjIoiMUYweq8yBhRjs8ZWKjdBskQ7tageeiyUBWP4kcyo94+U0N1gD7eS9EuxN7idf5rf dG0H3tq9+CkO5tXPIxQ1qVy0zqjkOT8hufAysBXh9jAJBuP0JsLkHFjuVaDuwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P8HnF6Vp9zLVR; Sat, 4 Feb 2023 16:20:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 314GKXBQ013770; Sat, 4 Feb 2023 16:20:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 314GKXwr013769; Sat, 4 Feb 2023 16:20:33 GMT (envelope-from git) Date: Sat, 4 Feb 2023 16:20:33 GMT Message-Id: <202302041620.314GKXwr013769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d27d543c7845 - main - vmm: purge EOL release compatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d27d543c78452b66f6324870e4a49e7285b049dd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d27d543c78452b66f6324870e4a49e7285b049dd commit d27d543c78452b66f6324870e4a49e7285b049dd Author: Elliott Mitchell AuthorDate: 2022-06-23 00:53:47 +0000 Commit: Warner Losh 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);