From nobody Thu Sep 08 16:17:44 2022 X-Original-To: dev-commits-src-main@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 4MNkmm6fY1z4cQTG; Thu, 8 Sep 2022 16:17:44 +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 4MNkmm67LDz3Tw5; Thu, 8 Sep 2022 16:17:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662653864; 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=Wgcby1s4mna98C3Vj3Zxx1v/UFIoqi2t63uBlxW/er8=; b=TqGFhO7TNYRZA3clugn6ldI0hSg85ByZ07ohzhIUafCrG6II5jjV9RjbZ7WF6jMCg/R9Sb aWS/DZaT5AloJ+JsEsb5DPfR+QwNpbXTfdAC7q2v8SE1KqQysPkxcdm5eaogPeYhAwi77e kKCAtNkWCnRG0Pq4goiMLUFL1ml2eWJexnjTinMmFE9LPcUxHFBnEhTnvmVD6Ld5i/wZLm EzHhUZvB8qn+8utgT8nWk9rpjarn7fbGyy55YqqLZesaeVcFcRly9kBCWccPxu69MIHeoU 1vmBwJnLEh71aPRVKNArcATkGivn7/kuAFPvKjqEtwevae+rk6K97qTaUSWm+A== 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 4MNkmm59dVzwMV; Thu, 8 Sep 2022 16:17:44 +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 288GHivD075217; Thu, 8 Sep 2022 16:17:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 288GHiJk075216; Thu, 8 Sep 2022 16:17:44 GMT (envelope-from git) Date: Thu, 8 Sep 2022 16:17:44 GMT Message-Id: <202209081617.288GHiJk075216@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: cb6abe87cf1c - main - hwpmc: purge EOL release compatibility List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb6abe87cf1c178ea1b9cd8a385e53459aef96e8 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662653864; 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=Wgcby1s4mna98C3Vj3Zxx1v/UFIoqi2t63uBlxW/er8=; b=mzNHlrKrj2wWDxBuVqA+nPUMJEzWUNqwco0M9w9RbCALwWSjOEVE7d1iDp3qRRnCRiFPpb /j9EZ5DD1sBu1vsHbTjEXAF2tz5+5qp4sfNv0klUc3wJorcVYG6ntHYj+qbjLHisTgcs3J PlKSU0vYQgJcLlec5Qwv89vxs8oYW9JfUjqsRK+2b4zb5xbLH4x9ZwIeYERWkcSm3bDxy2 RTahUYCJf4+5prMEFvEZN55uXmMa7UpkacKX6K2GzkBoHlIDyJv7h8X+q8juMsjOEuL+QK mPk7IYxBgBlpZNxtzbGIsDicHjbyjNiFCTki/EC5nb51966G0hyoPEvEozZDzQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662653864; a=rsa-sha256; cv=none; b=BmQ2OMTdlaKzTW/Hxm3DcB1a2bgCZDFohSYsxDjh5dOXCFd1eGhIIfLXjfkxIVyFHrnuMO DTz80soxL0R32585ZHdQNW46t/MvFf2XogJ0ARTk+8YJPZu1Qx/19Cz0by5NCUDcAPtHer zinIFrrXnQrG+wPHXUw8UqdMT1Wem4x1LpmUM5n0dAoELU2qDhRS/+jgwod4QWWQ7nbGGL bRhlj+US5XJjlPjxpjL6AqZl0h1+2hJuK7cb+txbXFSmO+6bEPt/SccHo9S8z2gE1WDPIm vmdTWHFi3tolF2iaitteV2wbER7K4aI0fvDckVloYTX7o/NIw7BtVEMAcWfNBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=cb6abe87cf1c178ea1b9cd8a385e53459aef96e8 commit cb6abe87cf1c178ea1b9cd8a385e53459aef96e8 Author: Elliott Mitchell AuthorDate: 2022-09-08 16:16:03 +0000 Commit: Mateusz Guzik CommitDate: 2022-09-08 16:17:24 +0000 hwpmc: purge EOL release compatibility --- 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 5b6744ab752c..1c48089a58dc 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 0d9085564c2a..577969b47fb7 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 6c39210d7f8f..e427139244ad 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