From nobody Fri Jun 09 19:58:10 2023 X-Original-To: dev-commits-src-branches@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 4QdBhf4Fvyz4cKSw; Fri, 9 Jun 2023 19:58:10 +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 4QdBhf2CsYz4JWb; Fri, 9 Jun 2023 19:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340690; 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=THOeQ5+rMmn9ZWsf37tPZTSsCn7g5vy1BMM60zLwmio=; b=xQY5RKfO4gK+xO4xNUwlDQQLXJoD3Li31A8OXVTRYXb+TcrjesCxcZrZ1AWc74fjzuXmsI 3ZoI/aTCL8+PYpoGyyXThc556kcUWo0i4d+dTL8+ttJtT6F4bjxkYCqeiHR5+VeRuDo0mr DFj3zk0T3Dx6Jy5CLKzUkf64dA8C3coUjxt6G2oZjPkK+3MbZNS5Ak05PDtXgAB/NeyIjo jsQbAJ6aOi/8cB4GI6Hv0lk4PJAK14CpMGld3TGuF/MS76wDYoZ74KAOokh6pKV5OuH92g NdGa8e31gTQB7XlhZDCmujs1FTYz1yU6rQbatcPAS1wq78iphlB4JSzALlOjJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1686340690; 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=THOeQ5+rMmn9ZWsf37tPZTSsCn7g5vy1BMM60zLwmio=; b=vSbDlbZLgQQPF32Lep8ovP0oGO406aU7mL+M44uKuAwelPQ8wikpvEi0zI69+JWMCvYD16 Zkx9bKACDe/vXaX+KzBQdKXLGk5+/MT3bG9DNkBaUpaFA0KiYqgKIrJobFC62bAH+9jXXZ 8F+6rfzJgyqSc14OUNiKVkf/sr0tgwSoiklMp04LxS6FeQUb1d0zF0jkECM39EYpd4CFnO cX0j4clwYMTLy3nPhxkMvjx3TnoLzKAm+IsOkQ+4W/AOlDV2KMj7xloXzMis94MIVtzDYL XEI1YZ2jJMdR1RFxp9CeLSlObczrry8lmtFGsLUi+m2G35506NLs54h53qvpGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1686340690; a=rsa-sha256; cv=none; b=txi4XrF1pS690d+9X2XrLt+HeOGQccxCEeHp2lt07lEHYJTm18kfKMIcAvmvRaWm3Oagb0 Ounqczp31MwJZnWxRajMqmjWkN6JHtw2qdmrRUe69JjO87PfRQmuD+HsdoLStkD2Z/tK0m wxaxfUIM2ViTVl7RvGLBO21BjteFBCXNcddtCX8mLqchwqB8FhPS9nT07NZQH69cr6isUr Wvpj9mT0+rlCnrSXF9TA0Gwi8gq7/UCO6zHBO/dVP+MzjwED2UD3xWbHtdWrK2eByQ2MgN MYQnDkdZeSX3kty9xZ6sCbKxm+QHp2KkVf6Md/VTjfX1ehjkYDOtzvPbYExGCQ== 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 4QdBhf1Jpmzp7Q; Fri, 9 Jun 2023 19:58:10 +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 359JwAvN072201; Fri, 9 Jun 2023 19:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 359JwAwj072200; Fri, 9 Jun 2023 19:58:10 GMT (envelope-from git) Date: Fri, 9 Jun 2023 19:58:10 GMT Message-Id: <202306091958.359JwAwj072200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mitchell Horne Subject: git: 14df23cfeadc - stable/13 - hwpmc: purge EOL release compatibility List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mhorne X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 14df23cfeadc70b757c09277db6e1040713701a2 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mhorne: URL: https://cgit.FreeBSD.org/src/commit/?id=14df23cfeadc70b757c09277db6e1040713701a2 commit 14df23cfeadc70b757c09277db6e1040713701a2 Author: Elliott Mitchell AuthorDate: 2022-09-08 16:16:03 +0000 Commit: Mitchell Horne CommitDate: 2023-06-09 18:14:59 +0000 hwpmc: purge EOL release compatibility (cherry picked from commit cb6abe87cf1c178ea1b9cd8a385e53459aef96e8) --- sys/dev/hwpmc/hwpmc_logging.c | 6 ------ sys/dev/hwpmc/hwpmc_uncore.c | 4 ---- sys/dev/hwpmc/hwpmc_x86.c | 4 ---- 3 files changed, 14 deletions(-) diff --git a/sys/dev/hwpmc/hwpmc_logging.c b/sys/dev/hwpmc/hwpmc_logging.c index b0dca3c15827..e0ff87619137 100644 --- a/sys/dev/hwpmc/hwpmc_logging.c +++ b/sys/dev/hwpmc/hwpmc_logging.c @@ -79,9 +79,6 @@ SYSCTL_DECL(_kern_hwpmc); */ static int pmclog_buffer_size = PMC_LOG_BUFFER_SIZE; -#if (__FreeBSD_version < 1100000) -TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "logbuffersize", &pmclog_buffer_size); -#endif SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN, &pmclog_buffer_size, 0, "size of log buffers in kilobytes"); @@ -90,9 +87,6 @@ SYSCTL_INT(_kern_hwpmc, OID_AUTO, logbuffersize, CTLFLAG_RDTUN, */ static int pmc_nlogbuffers_pcpu = PMC_NLOGBUFFERS_PCPU; -#if (__FreeBSD_version < 1100000) -TUNABLE_INT(PMC_SYSCTL_NAME_PREFIX "nbuffers", &pmc_nlogbuffers_pcpu); -#endif SYSCTL_INT(_kern_hwpmc, OID_AUTO, nbuffers_pcpu, CTLFLAG_RDTUN, &pmc_nlogbuffers_pcpu, 0, "number of log buffers per cpu"); diff --git a/sys/dev/hwpmc/hwpmc_uncore.c b/sys/dev/hwpmc/hwpmc_uncore.c index 47d1e62e2698..7f61deedfd79 100644 --- a/sys/dev/hwpmc/hwpmc_uncore.c +++ b/sys/dev/hwpmc/hwpmc_uncore.c @@ -40,11 +40,7 @@ __FBSDID("$FreeBSD$"); #include #include -#if (__FreeBSD_version >= 1100000) #include -#else -#include -#endif #include #include #include diff --git a/sys/dev/hwpmc/hwpmc_x86.c b/sys/dev/hwpmc/hwpmc_x86.c index 935ffefcf980..c30089accbef 100644 --- a/sys/dev/hwpmc/hwpmc_x86.c +++ b/sys/dev/hwpmc/hwpmc_x86.c @@ -42,11 +42,7 @@ __FBSDID("$FreeBSD$"); #include #include #include -#if (__FreeBSD_version >= 1100000) #include -#else -#include -#endif #include #include